diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx
index dbf643afc..2b97a4dca 100644
--- a/src/components/registration/steps.jsx
+++ b/src/components/registration/steps.jsx
@@ -226,7 +226,7 @@ module.exports = {
     ChoosePasswordStep: intl.injectIntl(React.createClass({
         getDefaultProps: function () {
             return {
-                studentUsername: null,
+                username: null,
                 showPassword: false,
                 waiting: false
             };
@@ -258,7 +258,7 @@ module.exports = {
                                    validations={{
                                        minLength: 6,
                                        notEquals: 'password',
-                                       notEqualsUsername: this.props.studentUsername
+                                       notEqualsUsername: this.props.username
                                    }}
                                    validationErrors={{
                                        minLength: formatMessage({
@@ -880,11 +880,7 @@ module.exports = {
             };
         },
         onNextStep: function () {
-            this.props.onNextStep({
-                user: {
-                    username: this.props.studentUsername
-                }
-            });
+            this.props.onNextStep();
         },
         render: function () {
             var formatMessage = this.props.intl.formatMessage;
diff --git a/src/views/studentcompleteregistration/studentcompleteregistration.jsx b/src/views/studentcompleteregistration/studentcompleteregistration.jsx
index 6b682c7ff..e8d429d54 100644
--- a/src/views/studentcompleteregistration/studentcompleteregistration.jsx
+++ b/src/views/studentcompleteregistration/studentcompleteregistration.jsx
@@ -133,10 +133,7 @@ var StudentCompleteRegistration = intl.injectIntl(React.createClass({
                                 <Steps.ChoosePasswordStep onNextStep={this.advanceStep}
                                                           showPassword={true}
                                                           waiting={this.state.waiting}
-                                                          studentUsername={
-                                                              this.state.formData.user &&
-                                                              this.state.formData.user.username
-                                                          } />
+                                                          username={this.props.studentUsername} />
                             :
                                 []
                             }