diff --git a/atst/forms/edit_user.py b/atst/forms/edit_user.py
index 66ecf23b..ea1ec182 100644
--- a/atst/forms/edit_user.py
+++ b/atst/forms/edit_user.py
@@ -22,7 +22,6 @@ USER_FIELDS = {
     ),
     "phone_number": TelField(
         "Phone Number",
-        description="Enter your 10-digit U.S. phone number",
         validators=[PhoneNumber()],
     ),
     "phone_ext": StringField("Extension"),
diff --git a/styles/elements/_inputs.scss b/styles/elements/_inputs.scss
index 2be9f2fe..916df01e 100644
--- a/styles/elements/_inputs.scss
+++ b/styles/elements/_inputs.scss
@@ -314,3 +314,36 @@ select {
   }
 
 }
+
+.phone-input {
+  display: flex;
+  flex-direction: row;
+
+  .phone-input__phone {
+    margin-right: ($gap * 4);
+
+    .usa-input {
+      input, label, .usa-input__message {
+        max-width: 20rem;
+      }
+
+      .icon-validation {
+        left: 20rem;
+      }
+    }
+  }
+
+  .phone-input__extension {
+    margin-left: ($gap * 4);
+
+    .usa-input {
+      input, label {
+        max-width: 8rem;
+      }
+
+      .icon-validation {
+        left: 5em;
+      }
+    }
+  }
+}
diff --git a/templates/fragments/edit_user_form.html b/templates/fragments/edit_user_form.html
index 66a28037..1cf03c7e 100644
--- a/templates/fragments/edit_user_form.html
+++ b/templates/fragments/edit_user_form.html
@@ -16,17 +16,15 @@
         </div>
       </div>
 
-      <div class='form-row'>
-        <div class='form-col form-col--half'>
-          {{ TextInput(form.email, validation='email') }}
-        </div>
+      {{ TextInput(form.email, validation='email') }}
 
-        <div class='form-col form-col--third'>
-          {{ TextInput(form.phone_number, validation='usPhone') }}
-        </div>
-        <div class='form-col form-col--sixth'>
-          {{ TextInput(form.phone_ext)}}
-        </div>
+      <div class='phone-input'>
+          <div class='phone-input__phone'>
+            {{ TextInput(form.phone_number, validation='usPhone') }}
+          </div>
+          <div class='phone-input__extension'>
+            {{ TextInput(form.phone_ext)}}
+          </div>
       </div>
 
       {{ OptionsInput(form.service_branch) }}