diff --git a/js/components/ascribe_settings/account_settings.js b/js/components/ascribe_settings/account_settings.js
index a613c3b4..aa50d719 100644
--- a/js/components/ascribe_settings/account_settings.js
+++ b/js/components/ascribe_settings/account_settings.js
@@ -104,7 +104,7 @@ let AccountSettings = React.createClass({
                 show={true}
                 defaultExpanded={true}>
                 {content}
-                <CopyrightAssociationForm currentUser={this.state.currentUser}/>
+                <CopyrightAssociationForm currentUser={this.props.currentUser}/>
                 {profile}
                 {/*<Form
                     url={AppConstants.serverUrl + 'api/users/set_language/'}>
diff --git a/js/components/ascribe_settings/settings_container.js b/js/components/ascribe_settings/settings_container.js
index 9b08af43..2b3dc6a7 100644
--- a/js/components/ascribe_settings/settings_container.js
+++ b/js/components/ascribe_settings/settings_container.js
@@ -43,15 +43,18 @@ let SettingsContainer = React.createClass({
     },
 
     render() {
-        return (
-            <div className="settings-container">
-                <AccountSettings currentUser={this.state.currentUser} loadUser={this.loadUser}/>
-                {this.props.children}
-                <APISettings />
-                <BitcoinWalletSettings />
-                <ContractSettings currentUser={this.state.currentUser} loadUser={this.loadUser}/>
-            </div>
-        );
+        if (this.state.currentUser && this.state.currentUser.username) {
+            return (
+                <div className="settings-container">
+                    <AccountSettings currentUser={this.state.currentUser} loadUser={this.loadUser}/>
+                    {this.props.children}
+                    <APISettings />
+                    <BitcoinWalletSettings />
+                    <ContractSettings currentUser={this.state.currentUser} loadUser={this.loadUser}/>
+                </div>
+            );
+        }
+        return null;
     }
 });