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 4fcca70fd..fbc8bfb1b 100644
--- a/plugins/talk-plugin-auth/client/profile-settings/components/ChangeUsername.js
+++ b/plugins/talk-plugin-auth/client/profile-settings/components/ChangeUsername.js
@@ -127,7 +127,10 @@ class ChangeUsername extends React.Component {
               className={cn(styles.button, styles.saveButton)}
               icon="save"
               onClick={this.onSave}
-              disabled={!this.state.formData.newUsername}
+              disabled={
+                !this.state.formData.newUsername &&
+                this.state.formData.newUsername !== username
+              }
             >
               {t('talk-plugin-auth.change_username.save')}
             </Button>
diff --git a/plugins/talk-plugin-auth/client/profile-settings/components/ChangeUsernameDialog.js b/plugins/talk-plugin-auth/client/profile-settings/components/ChangeUsernameDialog.js
index 244dba00a..5bcc43241 100644
--- a/plugins/talk-plugin-auth/client/profile-settings/components/ChangeUsernameDialog.js
+++ b/plugins/talk-plugin-auth/client/profile-settings/components/ChangeUsernameDialog.js
@@ -92,7 +92,7 @@ class ChangeUsernameDialog extends React.Component {
 
 ChangeUsernameDialog.propTypes = {
   closeDialog: PropTypes.func,
-  showDialog: PropTypes.func,
+  showDialog: PropTypes.bool,
   onChange: PropTypes.func,
   username: PropTypes.string,
   formData: PropTypes.object,
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 f76970045..ff0b47cf1 100644
--- a/plugins/talk-plugin-auth/client/profile-settings/components/InputField.css
+++ b/plugins/talk-plugin-auth/client/profile-settings/components/InputField.css
@@ -31,6 +31,10 @@
     line-height: 30px; 
   }
 
+  &.error {
+    border: solid 2px #FA4643;
+  }
+
   &.disabled {
     background-color: #E0E0E0;
   }
diff --git a/plugins/talk-plugin-auth/client/profile-settings/components/InputField.js b/plugins/talk-plugin-auth/client/profile-settings/components/InputField.js
index 7fa9a368a..34c314c20 100644
--- a/plugins/talk-plugin-auth/client/profile-settings/components/InputField.js
+++ b/plugins/talk-plugin-auth/client/profile-settings/components/InputField.js
@@ -74,7 +74,7 @@ const InputField = ({
 
 InputField.propTypes = {
   id: PropTypes.string,
-  disabled: PropTypes.boolean,
+  disabled: PropTypes.bool,
   label: PropTypes.string,
   type: PropTypes.string,
   name: PropTypes.string.isRequired,