diff --git a/src/react-components/profile-entry-panel.js b/src/react-components/profile-entry-panel.js
index 96016e0a552f7846903094efab30974f98737b4f..8850fb9e5e4fd01241109e8ef4f5885e9b063760 100644
--- a/src/react-components/profile-entry-panel.js
+++ b/src/react-components/profile-entry-panel.js
@@ -28,7 +28,8 @@ class ProfileEntryPanel extends Component {
 
   saveStateAndFinish = e => {
     e.preventDefault();
-    if (!this.state.has_agreed_to_terms) return;
+    const has_agreed_to_terms = this.props.store.state.profile.has_agreed_to_terms || this.state.has_agreed_to_terms;
+    if (!has_agreed_to_terms) return;
     this.props.store.update({
       profile: {
         has_saved_profile: true,