diff --git a/images/logo-elasticpress-io.svg b/images/logo-elasticpress-io.svg
index d913c0f9ff..8f09945710 100644
--- a/images/logo-elasticpress-io.svg
+++ b/images/logo-elasticpress-io.svg
@@ -1,4 +1,4 @@
-<svg width="275" height="51" viewBox="0 0 275 51" fill="none" xmlns="https://www.w3.org/2000/svg">
+<svg width="275" height="51" viewBox="0 0 275 51" fill="none" xmlns="http://www.w3.org/2000/svg">
 <title>ElasticPress.io Logo</title>
 <path d="M78.0389 35.0024C73.8304 35.0024 70.3433 31.7548 70.3433 26.9435C70.3433 22.493 73.4696 18.8845 77.7984 18.8845C82.3677 18.8845 85.0131 22.6133 85.0131 26.7029C85.0131 27.3043 84.5322 27.7855 83.9309 27.7855H72.7482C73.1089 31.1534 75.3935 33.0779 78.1592 33.0779C80.0831 33.0779 81.526 32.3562 82.6082 31.2737C82.7285 31.1534 82.969 31.0331 83.2095 31.0331C83.8107 31.0331 84.1714 31.5142 84.1714 31.9954C84.1714 32.2359 84.0512 32.4765 83.8107 32.7171C82.488 34.0402 80.6843 35.0024 78.0389 35.0024ZM82.6082 26.1015C82.3677 23.335 80.8046 20.809 77.6782 20.809C75.0328 20.809 72.9887 23.0944 72.6279 26.1015H82.6082Z" fill="black"></path>
 <path d="M89.2217 13.8326C89.2217 13.2312 89.7027 12.6298 90.3039 12.6298C90.9051 12.6298 91.5063 13.1109 91.5063 13.8326V33.6793C91.5063 34.2807 91.0254 34.8821 90.4241 34.8821C89.8229 34.8821 89.2217 34.401 89.2217 33.6793V13.8326Z" fill="black"></path>
diff --git a/images/logo-icon.svg b/images/logo-icon.svg
index 4c102db77c..d3b4c7616f 100644
--- a/images/logo-icon.svg
+++ b/images/logo-icon.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 61.8 61.8"><defs><style>.cls-1{fill:#231f20;}.cls-2{fill:#e9383e;}</style></defs><title>logo</title><path class="cls-2" d="M54.7,23.9A30.92,30.92,0,0,0,23.8,54.8,30.6,30.6,0,0,0,35.9,79.3l4.5-4.5c0.1-.1.1-0.2,0.2-0.3l0.7-.7,6.4-6.4a14.21,14.21,0,0,0,7.1,1.9,14.52,14.52,0,1,0-12.4-7L36,68.8a23.19,23.19,0,0,1-4.6-13.9A23.36,23.36,0,1,1,48.7,77.4l-0.6.6-5.2,5.4A30.92,30.92,0,1,0,54.7,23.9Z" transform="translate(-23.8 -23.9)"/></svg>
\ No newline at end of file
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 61.8 61.8"><defs><style>.cls-1{fill:#231f20;}.cls-2{fill:#e9383e;}</style></defs><title>logo</title><path class="cls-2" d="M54.7,23.9A30.92,30.92,0,0,0,23.8,54.8,30.6,30.6,0,0,0,35.9,79.3l4.5-4.5c0.1-.1.1-0.2,0.2-0.3l0.7-.7,6.4-6.4a14.21,14.21,0,0,0,7.1,1.9,14.52,14.52,0,1,0-12.4-7L36,68.8a23.19,23.19,0,0,1-4.6-13.9A23.36,23.36,0,1,1,48.7,77.4l-0.6.6-5.2,5.4A30.92,30.92,0,1,0,54.7,23.9Z" transform="translate(-23.8 -23.9)"/></svg>
\ No newline at end of file
diff --git a/images/logo.svg b/images/logo.svg
index 2dad352f59..9be5250e95 100644
--- a/images/logo.svg
+++ b/images/logo.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 236.8 61.8"><defs><style>.cls-1{fill:#231f20;}.cls-2{fill:#e9383e;}</style></defs><title>logo</title><path class="cls-1" d="M97.4,57.3a7.55,7.55,0,0,1,7.6-7.9c4.3,0,7.2,3,7.2,7.5v0.2a0.73,0.73,0,0,1-.9.9h-11a5.33,5.33,0,0,0,9.8,2.1,1.58,1.58,0,0,1,1.6,1.5c0,1.3-2.3,3.4-6.3,3.4C100.5,65.1,97.4,62,97.4,57.3Zm2.8-1.3h8.9c-0.2-2.6-1.7-4.2-4.2-4.2A4.74,4.74,0,0,0,100.2,56Z" transform="translate(-23.8 -23.9)"/><path class="cls-1" d="M115.1,63.4V43.8a1.54,1.54,0,0,1,1.1-.3c1,0,2,.5,2,2.6V63.4a1.3,1.3,0,0,1-1.4,1.5h-0.3A1.34,1.34,0,0,1,115.1,63.4Z" transform="translate(-23.8 -23.9)"/><path class="cls-1" d="M121.2,60.8c0-3.4,3.3-4.9,10-5h0.4V55.5c0-2.3-1.3-3.5-3.7-3.5a4.6,4.6,0,0,0-4.3,2.5s-1.9,0-1.9-1.5,2.2-3.6,6.4-3.6,6.5,2.2,6.5,5.9v9.1a1.3,1.3,0,0,1-1.1.3c-1.1,0-1.9-.6-1.9-2.4a6.46,6.46,0,0,1-5.4,2.6C123.1,65,121.2,63.3,121.2,60.8Zm10.4-2V57.7h-0.8c-4.3.2-6.6,1-6.6,3,0,1.3,1.1,2.2,2.8,2.2C129.7,62.8,131.6,61.2,131.6,58.8Z" transform="translate(-23.8 -23.9)"/><path class="cls-1" d="M137.2,61.9a1.47,1.47,0,0,1,1.2-1.4,6.08,6.08,0,0,0,5,2.2c2.1,0,3.3-.8,3.3-2,0-1.5-1.4-1.8-3.8-2.3-2.2-.5-5.2-1.1-5.2-4.3,0-2.8,2.3-4.7,5.9-4.7,3.8,0,5.7,1.6,5.7,3a1.57,1.57,0,0,1-1.2,1.4,5.5,5.5,0,0,0-4.4-2.1c-2.1,0-3.2.8-3.2,2,0,1.4,1.3,1.7,3.7,2.2s5.5,1.2,5.5,4.4c0,2.8-2.4,4.7-6.2,4.7C139.3,65.1,137.2,63.3,137.2,61.9Z" transform="translate(-23.8 -23.9)"/><path class="cls-1" d="M151.4,51.2V51a1.07,1.07,0,0,1,1.3-1.1h1.1V47.6a1.26,1.26,0,0,1,1.4-1.5h0.3c0.8,0,1.3.3,1.3,1.5v2.3h3.4c1,0,1.3.4,1.3,1.1v0.2a1.09,1.09,0,0,1-1.3,1.2h-3.4v7.5c0,1.9.5,2.8,2,2.8a2.36,2.36,0,0,0,2.1-1.1,1.16,1.16,0,0,1,.9,1.3c0,1.1-1.3,2.3-3.5,2.3-3.1,0-4.5-1.7-4.5-4.9V52.4h-1.1C151.7,52.3,151.4,51.9,151.4,51.2Z" transform="translate(-23.8 -23.9)"/><path class="cls-1" d="M164,44.9a1.64,1.64,0,0,1,1.9-1.7,1.61,1.61,0,0,1,1.8,1.7,1.56,1.56,0,0,1-1.8,1.7A1.64,1.64,0,0,1,164,44.9Zm0.3,18.5V51.1a1.3,1.3,0,0,1,1.4-1.5H166a1.25,1.25,0,0,1,1.4,1.5V63.3a1.3,1.3,0,0,1-1.4,1.5h-0.3A1.22,1.22,0,0,1,164.3,63.4Z" transform="translate(-23.8 -23.9)"/><path class="cls-1" d="M170.4,57.2a7.54,7.54,0,0,1,7.7-7.8c4.4,0,6.4,2.7,6.4,4.1s-1.7,1.5-1.8,1.4a4.53,4.53,0,0,0-4.5-2.9,4.92,4.92,0,0,0-4.9,5.2c0,3.1,2.1,5.3,4.9,5.3a4.53,4.53,0,0,0,4.5-2.9,1.55,1.55,0,0,1,1.8,1.4c0,1.4-2,4.1-6.4,4.1A7.51,7.51,0,0,1,170.4,57.2Z" transform="translate(-23.8 -23.9)"/><path class="cls-2" d="M54.7,23.9A30.92,30.92,0,0,0,23.8,54.8,30.6,30.6,0,0,0,35.9,79.3l4.5-4.5c0.1-.1.1-0.2,0.2-0.3l0.7-.7,6.4-6.4a14.21,14.21,0,0,0,7.1,1.9,14.52,14.52,0,1,0-12.4-7L36,68.8a23.19,23.19,0,0,1-4.6-13.9A23.36,23.36,0,1,1,48.7,77.4l-0.6.6-5.2,5.4A30.92,30.92,0,1,0,54.7,23.9Z" transform="translate(-23.8 -23.9)"/><path class="cls-2" d="M196.6,49.3a5.92,5.92,0,0,0-5.1,2.6c-0.1-2-1.1-2.4-2-2.4a1.36,1.36,0,0,0-1.2.4V69.2a1.4,1.4,0,0,0,1.5,1.6h0.3a1.36,1.36,0,0,0,1.5-1.6V62.6a6,6,0,0,0,5,2.5c4.2,0,7.2-3.3,7.2-8C203.6,52.6,200.7,49.3,196.6,49.3Zm-0.7,13.2a4.38,4.38,0,0,1-4.5-4.3V55.1a4.67,4.67,0,0,1,4.5-3c2.6,0,4.5,2.2,4.5,5.2S198.7,62.5,195.9,62.5Z" transform="translate(-23.8 -23.9)"/><path class="cls-2" d="M213.2,49.3a3.74,3.74,0,0,0-3.7,2.5c-0.2-1.8-1.2-2.2-2-2.2a1.36,1.36,0,0,0-1.2.4V63.4a1.4,1.4,0,0,0,1.5,1.6h0.3a1.36,1.36,0,0,0,1.5-1.6V58.2c0-2.6.6-5.7,3.3-5.7a2.79,2.79,0,0,1,1.8.6,0.14,0.14,0,0,0,.2,0,1.88,1.88,0,0,0,.9-1.7C215.8,50.1,214.8,49.3,213.2,49.3Z" transform="translate(-23.8 -23.9)"/><path class="cls-2" d="M224.5,49.3a7.65,7.65,0,0,0-7.7,8c0,4.7,3.2,7.9,8,7.9a8.64,8.64,0,0,0,4.7-1.2,3.27,3.27,0,0,0,1.7-2.3,1.68,1.68,0,0,0-1.1-1.5,1.48,1.48,0,0,0-.7-0.1h0a4.73,4.73,0,0,1-4.6,2.4,4.84,4.84,0,0,1-5-4.4h10.9a0.83,0.83,0,0,0,1-1V56.9C231.7,52.4,228.8,49.3,224.5,49.3Zm-4.6,6.6a4.62,4.62,0,0,1,4.6-4,4,4,0,0,1,4.1,4h-8.7Z" transform="translate(-23.8 -23.9)"/><path class="cls-2" d="M240.4,55.9c-2.5-.5-3.6-0.8-3.6-2.1s1.1-1.9,3.1-1.9a5.45,5.45,0,0,1,4.3,2.1,0.14,0.14,0,0,0,.2,0,1.77,1.77,0,0,0,1.2-1.5c0-1.5-2-3.1-5.8-3.1-3.6,0-6,1.9-6,4.8,0,3.3,3.2,4,5.3,4.4h0.1c2.4,0.5,3.7.8,3.7,2.2,0,1.2-1.2,1.9-3.2,1.9a6,6,0,0,1-4.9-2.2h0a0.76,0.76,0,0,0-.4.1,1.72,1.72,0,0,0-.9,1.4c0,1.6,2.4,3.3,6.4,3.3s6.3-1.8,6.3-4.8C246,57.1,242.8,56.4,240.4,55.9Z" transform="translate(-23.8 -23.9)"/><path class="cls-2" d="M254.8,55.9c-2.5-.5-3.6-0.8-3.6-2.1s1.1-1.9,3.1-1.9a5.45,5.45,0,0,1,4.3,2.1,0.14,0.14,0,0,0,.2,0,1.77,1.77,0,0,0,1.2-1.5c0-1.5-2-3.1-5.8-3.1-3.6,0-6,1.9-6,4.8,0,3.3,3.2,4,5.3,4.4h0.1c2.4,0.5,3.7.8,3.7,2.2,0,1.2-1.2,1.9-3.2,1.9a6,6,0,0,1-4.9-2.2h0a0.76,0.76,0,0,0-.4.1,1.72,1.72,0,0,0-.9,1.4c0,1.6,2.4,3.3,6.4,3.3s6.3-1.8,6.3-4.8C260.4,57.1,257.2,56.4,254.8,55.9Z" transform="translate(-23.8 -23.9)"/></svg>
\ No newline at end of file
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 236.8 61.8"><defs><style>.cls-1{fill:#231f20;}.cls-2{fill:#e9383e;}</style></defs><title>logo</title><path class="cls-1" d="M97.4,57.3a7.55,7.55,0,0,1,7.6-7.9c4.3,0,7.2,3,7.2,7.5v0.2a0.73,0.73,0,0,1-.9.9h-11a5.33,5.33,0,0,0,9.8,2.1,1.58,1.58,0,0,1,1.6,1.5c0,1.3-2.3,3.4-6.3,3.4C100.5,65.1,97.4,62,97.4,57.3Zm2.8-1.3h8.9c-0.2-2.6-1.7-4.2-4.2-4.2A4.74,4.74,0,0,0,100.2,56Z" transform="translate(-23.8 -23.9)"/><path class="cls-1" d="M115.1,63.4V43.8a1.54,1.54,0,0,1,1.1-.3c1,0,2,.5,2,2.6V63.4a1.3,1.3,0,0,1-1.4,1.5h-0.3A1.34,1.34,0,0,1,115.1,63.4Z" transform="translate(-23.8 -23.9)"/><path class="cls-1" d="M121.2,60.8c0-3.4,3.3-4.9,10-5h0.4V55.5c0-2.3-1.3-3.5-3.7-3.5a4.6,4.6,0,0,0-4.3,2.5s-1.9,0-1.9-1.5,2.2-3.6,6.4-3.6,6.5,2.2,6.5,5.9v9.1a1.3,1.3,0,0,1-1.1.3c-1.1,0-1.9-.6-1.9-2.4a6.46,6.46,0,0,1-5.4,2.6C123.1,65,121.2,63.3,121.2,60.8Zm10.4-2V57.7h-0.8c-4.3.2-6.6,1-6.6,3,0,1.3,1.1,2.2,2.8,2.2C129.7,62.8,131.6,61.2,131.6,58.8Z" transform="translate(-23.8 -23.9)"/><path class="cls-1" d="M137.2,61.9a1.47,1.47,0,0,1,1.2-1.4,6.08,6.08,0,0,0,5,2.2c2.1,0,3.3-.8,3.3-2,0-1.5-1.4-1.8-3.8-2.3-2.2-.5-5.2-1.1-5.2-4.3,0-2.8,2.3-4.7,5.9-4.7,3.8,0,5.7,1.6,5.7,3a1.57,1.57,0,0,1-1.2,1.4,5.5,5.5,0,0,0-4.4-2.1c-2.1,0-3.2.8-3.2,2,0,1.4,1.3,1.7,3.7,2.2s5.5,1.2,5.5,4.4c0,2.8-2.4,4.7-6.2,4.7C139.3,65.1,137.2,63.3,137.2,61.9Z" transform="translate(-23.8 -23.9)"/><path class="cls-1" d="M151.4,51.2V51a1.07,1.07,0,0,1,1.3-1.1h1.1V47.6a1.26,1.26,0,0,1,1.4-1.5h0.3c0.8,0,1.3.3,1.3,1.5v2.3h3.4c1,0,1.3.4,1.3,1.1v0.2a1.09,1.09,0,0,1-1.3,1.2h-3.4v7.5c0,1.9.5,2.8,2,2.8a2.36,2.36,0,0,0,2.1-1.1,1.16,1.16,0,0,1,.9,1.3c0,1.1-1.3,2.3-3.5,2.3-3.1,0-4.5-1.7-4.5-4.9V52.4h-1.1C151.7,52.3,151.4,51.9,151.4,51.2Z" transform="translate(-23.8 -23.9)"/><path class="cls-1" d="M164,44.9a1.64,1.64,0,0,1,1.9-1.7,1.61,1.61,0,0,1,1.8,1.7,1.56,1.56,0,0,1-1.8,1.7A1.64,1.64,0,0,1,164,44.9Zm0.3,18.5V51.1a1.3,1.3,0,0,1,1.4-1.5H166a1.25,1.25,0,0,1,1.4,1.5V63.3a1.3,1.3,0,0,1-1.4,1.5h-0.3A1.22,1.22,0,0,1,164.3,63.4Z" transform="translate(-23.8 -23.9)"/><path class="cls-1" d="M170.4,57.2a7.54,7.54,0,0,1,7.7-7.8c4.4,0,6.4,2.7,6.4,4.1s-1.7,1.5-1.8,1.4a4.53,4.53,0,0,0-4.5-2.9,4.92,4.92,0,0,0-4.9,5.2c0,3.1,2.1,5.3,4.9,5.3a4.53,4.53,0,0,0,4.5-2.9,1.55,1.55,0,0,1,1.8,1.4c0,1.4-2,4.1-6.4,4.1A7.51,7.51,0,0,1,170.4,57.2Z" transform="translate(-23.8 -23.9)"/><path class="cls-2" d="M54.7,23.9A30.92,30.92,0,0,0,23.8,54.8,30.6,30.6,0,0,0,35.9,79.3l4.5-4.5c0.1-.1.1-0.2,0.2-0.3l0.7-.7,6.4-6.4a14.21,14.21,0,0,0,7.1,1.9,14.52,14.52,0,1,0-12.4-7L36,68.8a23.19,23.19,0,0,1-4.6-13.9A23.36,23.36,0,1,1,48.7,77.4l-0.6.6-5.2,5.4A30.92,30.92,0,1,0,54.7,23.9Z" transform="translate(-23.8 -23.9)"/><path class="cls-2" d="M196.6,49.3a5.92,5.92,0,0,0-5.1,2.6c-0.1-2-1.1-2.4-2-2.4a1.36,1.36,0,0,0-1.2.4V69.2a1.4,1.4,0,0,0,1.5,1.6h0.3a1.36,1.36,0,0,0,1.5-1.6V62.6a6,6,0,0,0,5,2.5c4.2,0,7.2-3.3,7.2-8C203.6,52.6,200.7,49.3,196.6,49.3Zm-0.7,13.2a4.38,4.38,0,0,1-4.5-4.3V55.1a4.67,4.67,0,0,1,4.5-3c2.6,0,4.5,2.2,4.5,5.2S198.7,62.5,195.9,62.5Z" transform="translate(-23.8 -23.9)"/><path class="cls-2" d="M213.2,49.3a3.74,3.74,0,0,0-3.7,2.5c-0.2-1.8-1.2-2.2-2-2.2a1.36,1.36,0,0,0-1.2.4V63.4a1.4,1.4,0,0,0,1.5,1.6h0.3a1.36,1.36,0,0,0,1.5-1.6V58.2c0-2.6.6-5.7,3.3-5.7a2.79,2.79,0,0,1,1.8.6,0.14,0.14,0,0,0,.2,0,1.88,1.88,0,0,0,.9-1.7C215.8,50.1,214.8,49.3,213.2,49.3Z" transform="translate(-23.8 -23.9)"/><path class="cls-2" d="M224.5,49.3a7.65,7.65,0,0,0-7.7,8c0,4.7,3.2,7.9,8,7.9a8.64,8.64,0,0,0,4.7-1.2,3.27,3.27,0,0,0,1.7-2.3,1.68,1.68,0,0,0-1.1-1.5,1.48,1.48,0,0,0-.7-0.1h0a4.73,4.73,0,0,1-4.6,2.4,4.84,4.84,0,0,1-5-4.4h10.9a0.83,0.83,0,0,0,1-1V56.9C231.7,52.4,228.8,49.3,224.5,49.3Zm-4.6,6.6a4.62,4.62,0,0,1,4.6-4,4,4,0,0,1,4.1,4h-8.7Z" transform="translate(-23.8 -23.9)"/><path class="cls-2" d="M240.4,55.9c-2.5-.5-3.6-0.8-3.6-2.1s1.1-1.9,3.1-1.9a5.45,5.45,0,0,1,4.3,2.1,0.14,0.14,0,0,0,.2,0,1.77,1.77,0,0,0,1.2-1.5c0-1.5-2-3.1-5.8-3.1-3.6,0-6,1.9-6,4.8,0,3.3,3.2,4,5.3,4.4h0.1c2.4,0.5,3.7.8,3.7,2.2,0,1.2-1.2,1.9-3.2,1.9a6,6,0,0,1-4.9-2.2h0a0.76,0.76,0,0,0-.4.1,1.72,1.72,0,0,0-.9,1.4c0,1.6,2.4,3.3,6.4,3.3s6.3-1.8,6.3-4.8C246,57.1,242.8,56.4,240.4,55.9Z" transform="translate(-23.8 -23.9)"/><path class="cls-2" d="M254.8,55.9c-2.5-.5-3.6-0.8-3.6-2.1s1.1-1.9,3.1-1.9a5.45,5.45,0,0,1,4.3,2.1,0.14,0.14,0,0,0,.2,0,1.77,1.77,0,0,0,1.2-1.5c0-1.5-2-3.1-5.8-3.1-3.6,0-6,1.9-6,4.8,0,3.3,3.2,4,5.3,4.4h0.1c2.4,0.5,3.7.8,3.7,2.2,0,1.2-1.2,1.9-3.2,1.9a6,6,0,0,1-4.9-2.2h0a0.76,0.76,0,0,0-.4.1,1.72,1.72,0,0,0-.9,1.4c0,1.6,2.4,3.3,6.4,3.3s6.3-1.8,6.3-4.8C260.4,57.1,257.2,56.4,254.8,55.9Z" transform="translate(-23.8 -23.9)"/></svg>
\ No newline at end of file
diff --git a/images/warning.svg b/images/warning.svg
index 6765fab1ca..fe60e7d28e 100644
--- a/images/warning.svg
+++ b/images/warning.svg
@@ -1,3 +1,3 @@
-<svg width="22" height="19" viewBox="0 0 22 19" fill="none" xmlns="https://www.w3.org/2000/svg">
+<svg width="22" height="19" viewBox="0 0 22 19" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M0 19H22L11 0L0 19ZM12 16H10V14H12V16ZM12 12H10V8H12V12Z" fill="#FFB359"/>
 </svg>
diff --git a/includes/classes/Upgrades.php b/includes/classes/Upgrades.php
index a3d966307a..82e1da3ac6 100644
--- a/includes/classes/Upgrades.php
+++ b/includes/classes/Upgrades.php
@@ -8,7 +8,7 @@
 
 namespace ElasticPress;
 
-use ElasticPress\Utils as Utils;
+use ElasticPress\Utils;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly.
@@ -46,6 +46,7 @@ public function setup() {
 			'3.5.3' => [ 'upgrade_3_5_3', 'init' ],
 			'3.6.6' => [ 'upgrade_3_6_6', 'init' ],
 			'4.2.2' => [ 'upgrade_4_2_2', 'init' ],
+			'4.4.0' => [ 'upgrade_4_4_0', 'init' ],
 		];
 
 		array_walk( $routines, [ $this, 'run_upgrade_routine' ] );
@@ -179,6 +180,17 @@ public function upgrade_4_2_2() {
 		}
 	}
 
+	/**
+	 * Upgrade routine of v4.4.0.
+	 *
+	 * Delete the ep_prefix option, as that is now obtained via ep_credentials
+	 *
+	 * @see https://github.com/10up/ElasticPress/issues/2739
+	 */
+	public function upgrade_4_4_0() {
+		Utils\delete_option( 'ep_prefix' );
+	}
+
 	/**
 	 * Adjust the upgrade sync notice to warn users about Instant Results.
 	 *
diff --git a/includes/dashboard.php b/includes/dashboard.php
index 95b6df9737..06f1814ae2 100644
--- a/includes/dashboard.php
+++ b/includes/dashboard.php
@@ -606,11 +606,6 @@ function action_admin_init() {
 			Utils\update_option( 'ep_host', $host );
 		}
 
-		if ( isset( $_POST['ep_prefix'] ) ) {
-			$prefix = ( isset( $_POST['ep_prefix'] ) ) ? sanitize_text_field( wp_unslash( $_POST['ep_prefix'] ) ) : '';
-			Utils\update_option( 'ep_prefix', $prefix );
-		}
-
 		if ( isset( $_POST['ep_credentials'] ) ) {
 			$credentials = ( isset( $_POST['ep_credentials'] ) ) ? Utils\sanitize_credentials( $_POST['ep_credentials'] ) : [
 				'username' => '',
@@ -625,7 +620,6 @@ function action_admin_init() {
 		}
 	} else {
 		register_setting( 'elasticpress', 'ep_host', 'esc_url_raw' );
-		register_setting( 'elasticpress', 'ep_prefix', 'sanitize_text_field' );
 		register_setting( 'elasticpress', 'ep_credentials', 'ep_sanitize_credentials' );
 		register_setting( 'elasticpress', 'ep_language', 'sanitize_text_field' );
 		register_setting(
diff --git a/includes/partials/settings-page.php b/includes/partials/settings-page.php
index dc8f0e40fb..088a7ee0a6 100644
--- a/includes/partials/settings-page.php
+++ b/includes/partials/settings-page.php
@@ -90,42 +90,18 @@
 									<?php if ( $wpconfig ) : ?>
 										<p class="description ep-host-legend"><?php esc_html_e( 'Host already defined in wp-config.php.', 'elasticpress' ); ?></p>
 									<?php elseif ( $is_epio ) : ?>
-										<p class="description ep-host-legend"><?php esc_html_e( 'Plug in your ElasticPress.io server here!', 'elasticpress' ); ?></p>
+										<p class="description ep-host-legend"><?php esc_html_e( 'Plug in your ElasticPress.io server here.', 'elasticpress' ); ?></p>
 									<?php else : ?>
-										<p class="description ep-host-legend"><?php esc_html_e( 'Plug in your Elasticsearch server here!', 'elasticpress' ); ?></p>
+										<p class="description ep-host-legend"><?php esc_html_e( 'Plug in your Elasticsearch server here.', 'elasticpress' ); ?></p>
 									<?php endif; ?>
 								<?php endif; ?>
 							</td>
 						</tr>
 						<?php if ( $is_epio || ! $wpconfig ) : ?>
-							<tr class="ep-additional-fields <?php if ( $host && ! $is_epio ) { ?>hidden<?php } ?>">
-								<th scope="row">
-									<label for="ep_prefix"><?php esc_html_e( 'Subscription ID', 'elasticpress' ); ?></label>
-								</th>
-								<td>
-									<?php
-									/**
-									 * Filter whether to show index prefix field in admin UI or not
-									 *
-									 * @hook ep_admin_index_prefix
-									 * @param  {boolean} $show True to show
-									 * @return {boolean} New value
-									 */
-									if ( apply_filters( 'ep_admin_show_index_prefix', true ) ) :
-										?>
-										<input <?php if ( defined( 'EP_INDEX_PREFIX' ) && EP_INDEX_PREFIX ) : ?>disabled<?php endif; ?> type="text" value="<?php echo esc_attr( rtrim( Utils\get_index_prefix(), '-' ) ); ?>" name="ep_prefix" id="ep_prefix">
-									<?php endif ?>
-									<?php if ( defined( 'EP_INDEX_PREFIX' ) && EP_INDEX_PREFIX ) : ?>
-										<p class="description"><?php esc_html_e( 'Your Subscription ID is set in wp-config.php', 'elasticpress' ); ?></p>
-									<?php else : ?>
-										<p class="description"><?php esc_html_e( 'Plug in your Subscription ID here.', 'elasticpress' ); ?></p>
-									<?php endif; ?>
-								</td>
-							</tr>
 
 							<tr class="ep-additional-fields <?php if ( $host && ! $is_epio ) { ?>hidden<?php } ?>" aria-hidden="<?php if ( $host && ! $is_epio ) { ?>true<?php } else { ?>false<?php } ?>">
 								<th scope="row">
-									<label for="ep_username"><?php esc_html_e( 'Subscription Username', 'elasticpress' ); ?></label>
+									<label for="ep_username"><?php esc_html_e( 'Subscription ID', 'elasticpress' ); ?></label>
 								</th>
 								<td>
 									<?php
@@ -141,16 +117,17 @@
 										<input <?php if ( defined( 'EP_CREDENTIALS' ) && EP_CREDENTIALS ) : ?>disabled<?php endif; ?> type="text" value="<?php echo esc_attr( $credentials['username'] ); ?>" name="ep_credentials[username]" id="ep_username">
 									<?php endif ?>
 									<?php if ( defined( 'EP_CREDENTIALS' ) && EP_CREDENTIALS ) : ?>
-										<p class="description"><?php esc_html_e( 'Your Subscription Username is set in wp-config.php', 'elasticpress' ); ?></p>
+										<p class="description"><?php esc_html_e( 'Your Subscription ID is set in wp-config.php', 'elasticpress' ); ?></p>
 									<?php else : ?>
-										<p class="description"><?php esc_html_e( 'Plug in your subscription username here.', 'elasticpress' ); ?></p>
+										<p class="description"><?php esc_html_e( 'Plug in your subscription ID (or subscription name) here.', 'elasticpress' ); ?></p>
 									<?php endif; ?>
 								</td>
 							</tr>
 
 							<tr class="ep-additional-fields <?php if ( $host && ! $is_epio ) { ?>hidden<?php } ?>" aria-hidden="<?php if ( $host && ! $is_epio ) { ?>true<?php } else { ?>false<?php } ?>">
 								<th scope="row">
-									<label for="ep_token"><?php esc_html_e( 'Subscription Token', 'elasticpress' ); ?></label></th>
+									<label for="ep_token"><?php esc_html_e( 'Subscription Token', 'elasticpress' ); ?></label>
+								</th>
 								<td>
 									<?php
 									/**
diff --git a/includes/utils.php b/includes/utils.php
index fabfcf5f59..3199f30098 100644
--- a/includes/utils.php
+++ b/includes/utils.php
@@ -77,14 +77,15 @@ function get_shield_credentials() {
  * @return string|bool
  */
 function get_index_prefix() {
-	if ( defined( 'EP_INDEX_PREFIX' ) && EP_INDEX_PREFIX ) {
-		$prefix = EP_INDEX_PREFIX;
-	} elseif ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK && is_epio() ) {
-		$prefix = get_site_option( 'ep_prefix', false );
+	if ( defined( 'EP_INDEX_PREFIX' ) && \EP_INDEX_PREFIX ) {
+		$prefix = \EP_INDEX_PREFIX;
 	} elseif ( is_epio() ) {
-		$prefix = get_option( 'ep_prefix', false );
-
-		if ( '-' !== substr( $prefix, - 1 ) ) {
+		$credentials = get_epio_credentials();
+		$prefix      = $credentials['username'];
+		if (
+			( ! defined( 'EP_IS_NETWORK' ) || ! EP_IS_NETWORK ) &&
+			( '-' !== substr( $prefix, - 1 ) )
+		) {
 			$prefix .= '-';
 		}
 	} else {