diff --git a/src/components/navigation/navigation.jsx b/src/components/navigation/navigation.jsx
index 6c3181357..c129ad9db 100644
--- a/src/components/navigation/navigation.jsx
+++ b/src/components/navigation/navigation.jsx
@@ -96,6 +96,10 @@ var Navigation = React.createClass({
     closeRegistration: function () {
         this.setState({'registrationOpen': false});
     },
+    completeRegistration: function () {
+        window.refreshSession();
+        this.closeRegistration();
+    },
     render: function () {
         var classes = classNames({
             'inner': true,
@@ -151,7 +155,8 @@ var Navigation = React.createClass({
                         <Registration
                                 key="registration"
                                 isOpen={this.state.registrationOpen}
-                                onRequestClose={this.closeRegistration} />,
+                                onRequestClose={this.closeRegistration}
+                                onRegistrationDone={this.completeRegistration} />,
                         <li className="link right login-item" key="login">
                             <a
                                 href="#"
diff --git a/src/components/registration/registration.jsx b/src/components/registration/registration.jsx
index c82fff82f..7e8b3ae22 100644
--- a/src/components/registration/registration.jsx
+++ b/src/components/registration/registration.jsx
@@ -7,9 +7,20 @@ Modal.setAppElement(document.getElementById('view'));
 
 module.exports = React.createClass({
     propTypes: {
-        isOpen: React.PropTypes.func,
+        isOpen: React.PropTypes.bool,
+        onRegistrationDone: React.PropTypes.func,
         onRequestClose: React.PropTypes.func
     },
+    onMessage: function (e) {
+        if (e.origin != window.location.origin) return;
+        if (e.data == 'registration-done') this.props.onRegistrationDone();
+    },
+    componentDidMount: function () {
+        window.addEventListener('message', this.onMessage);
+    },
+    componentWillUnmount: function () {
+        window.removeEventListener('message', this.onMessage);
+    },
     render: function () {
         return (
             <Modal