diff --git a/plugins/talk-plugin-local-auth/client/components/ChangePassword.js b/plugins/talk-plugin-local-auth/client/components/ChangePassword.js
index 891c320c6..1ceb1b9f5 100644
--- a/plugins/talk-plugin-local-auth/client/components/ChangePassword.js
+++ b/plugins/talk-plugin-local-auth/client/components/ChangePassword.js
@@ -14,7 +14,11 @@ const initialState = {
   editing: false,
   showErrors: true,
   errors: {},
-  formData: {},
+  formData: {
+    oldPassword: '',
+    newPassword: '',
+    confirmNewPassword: '',
+  },
 };
 
 class ChangePassword extends React.Component {
diff --git a/plugins/talk-plugin-local-auth/client/components/InputField.js b/plugins/talk-plugin-local-auth/client/components/InputField.js
index 930c15582..7dca22197 100644
--- a/plugins/talk-plugin-local-auth/client/components/InputField.js
+++ b/plugins/talk-plugin-local-auth/client/components/InputField.js
@@ -19,13 +19,13 @@ const InputField = ({
   showSuccess = false,
   validationType = '',
   icon = '',
-  value = '',
-  defaultValue = '',
+  value,
+  defaultValue,
   disabled = false,
 }) => {
   const inputValue = {
-    ...(value ? { value } : {}),
-    ...(defaultValue ? { defaultValue } : {}),
+    ...(value !== undefined ? { value } : {}),
+    ...(defaultValue !== undefined ? { defaultValue } : {}),
   };
 
   return (