diff --git a/plugins/talk-plugin-auth/client/profile-settings/components/ChangeUsername.js b/plugins/talk-plugin-auth/client/profile-settings/components/ChangeUsername.js
index fbc8bfb1b..8423ed403 100644
--- a/plugins/talk-plugin-auth/client/profile-settings/components/ChangeUsername.js
+++ b/plugins/talk-plugin-auth/client/profile-settings/components/ChangeUsername.js
@@ -120,7 +120,6 @@ class ChangeUsername extends React.Component {
             ) : null}
           </div>
         )}
-
         {editing ? (
           <div className={styles.actions}>
             <Button
@@ -128,8 +127,8 @@ class ChangeUsername extends React.Component {
               icon="save"
               onClick={this.onSave}
               disabled={
-                !this.state.formData.newUsername &&
-                this.state.formData.newUsername !== username
+                !this.state.formData.newUsername ||
+                this.state.formData.newUsername === username
               }
             >
               {t('talk-plugin-auth.change_username.save')}
diff --git a/plugins/talk-plugin-auth/client/profile-settings/components/InputField.css b/plugins/talk-plugin-auth/client/profile-settings/components/InputField.css
index ff0b47cf1..2bebca8ec 100644
--- a/plugins/talk-plugin-auth/client/profile-settings/components/InputField.css
+++ b/plugins/talk-plugin-auth/client/profile-settings/components/InputField.css
@@ -23,6 +23,7 @@
   display: inline-block;
   width: 230px;
   display: flex;  
+  box-sizing: border-box;
 
   > .detailIcon {
     font-size: 1.2em;