diff --git a/app/gabsocial/features/edit_profile/index.js b/app/gabsocial/features/edit_profile/index.js
index d166f106d..cac76d811 100644
--- a/app/gabsocial/features/edit_profile/index.js
+++ b/app/gabsocial/features/edit_profile/index.js
@@ -86,7 +86,9 @@ class EditProfile extends ImmutablePureComponent {
 
   componentWillMount() {
     const { account } = this.props;
-    this.setState(account.toJS());
+    const sourceData = account.get('source');
+    const initialState = account.merge(sourceData).delete('source');
+    this.setState(initialState.toJS());
   }
 
   handleCheckboxChange = e => {