diff --git a/client/coral-sign-in/components/CreateUsernameDialog.js b/client/coral-sign-in/components/CreateUsernameDialog.js
index f0edc7398..d0e348046 100644
--- a/client/coral-sign-in/components/CreateUsernameDialog.js
+++ b/client/coral-sign-in/components/CreateUsernameDialog.js
@@ -50,7 +50,6 @@ const CreateUsernameDialog = ({open, handleClose, offset, formData, handleSubmit
             />
             <Button id="save" type="submit" className={styles.saveButton}>{lang.t('createdisplay.save')}</Button>
           </div>
-          <Button className={styles.continuebutton} onClick={handleClose}>{lang.t('createdisplay.continue')}</Button>
       </form>
       </div>
     </div>
diff --git a/client/coral-sign-in/components/styles.css b/client/coral-sign-in/components/styles.css
index 81afe75e5..617c8d1cb 100644
--- a/client/coral-sign-in/components/styles.css
+++ b/client/coral-sign-in/components/styles.css
@@ -173,13 +173,6 @@ input.error{
   color: white;
 }
 
-.continuebutton {
-  background-color: black;
-  font-weight: bold;
-  color: white;
-  min-width: 200px;
-}
-
 .fakeComment {
   display: block;
   margin-bottom: 5px;
diff --git a/client/coral-sign-in/containers/ChangeUsernameContainer.js b/client/coral-sign-in/containers/ChangeUsernameContainer.js
index ca065169f..c4450aa56 100644
--- a/client/coral-sign-in/containers/ChangeUsernameContainer.js
+++ b/client/coral-sign-in/containers/ChangeUsernameContainer.js
@@ -104,7 +104,7 @@ class ChangeUsernameContainer extends Component {
     return (
       <div>
         <CreateUsernameDialog
-          open={auth.showCreateUsernameDialog && auth.fromSignUp}
+          open={auth.showCreateUsernameDialog && auth.user.canEditName}
           offset={offset}
           handleClose={this.handleClose}
           loggedIn={loggedIn}
diff --git a/routes/api/auth/index.js b/routes/api/auth/index.js
index dcce15933..8bd7a1263 100644
--- a/routes/api/auth/index.js
+++ b/routes/api/auth/index.js
@@ -2,7 +2,6 @@ const express = require('express');
 const passport = require('../../../services/passport');
 const authorization = require('../../../middleware/authorization');
 const errors = require('../../../errors');
-const UsersService = require('../../../services/users');
 
 const router = express.Router();
 
@@ -61,6 +60,7 @@ const HandleAuthCallback = (req, res, next) => (err, user) => {
 /**
  * Returns the response to the login attempt via a popup callback with some JS.
  */
+
 const HandleAuthPopupCallback = (req, res, next) => (err, user) => {
   if (err) {
     return res.render('auth-callback', {err: JSON.stringify(err), data: null});
@@ -70,20 +70,15 @@ const HandleAuthPopupCallback = (req, res, next) => (err, user) => {
     return res.render('auth-callback', {err: JSON.stringify(errors.ErrNotAuthorized), data: null});
   }
 
-  // Authorize the user to edit their username.
-  UsersService.toggleNameEdit(user.id, true)
-    .then(() => {
-      
-      // Perform the login of the user!
-      req.logIn(user, (err) => {
-        if (err) {
-          return res.render('auth-callback', {err: JSON.stringify(err), data: null});
-        }
+  // Perform the login of the user!
+  req.logIn(user, (err) => {
+    if (err) {
+      return res.render('auth-callback', {err: JSON.stringify(err), data: null});
+    }
 
-        // We logged in the user! Let's send back the user data.
-        res.render('auth-callback', {err: null, data: JSON.stringify(user)});
-      });
-    });
+    // We logged in the user! Let's send back the user data.
+    res.render('auth-callback', {err: null, data: JSON.stringify(user), changeusername: true});
+  });
 };
 
 /**
diff --git a/services/users.js b/services/users.js
index cf3a0063d..b58776a75 100644
--- a/services/users.js
+++ b/services/users.js
@@ -124,6 +124,8 @@ module.exports = class UsersService {
           return user;
         }
 
+        // User does not exist and need to be created.
+
         let username = UsersService.castUsername(displayName);
 
         // The user was not found, lets create them!
@@ -131,7 +133,8 @@ module.exports = class UsersService {
           username,
           lowercaseUsername: username.toLowerCase(),
           roles: [],
-          profiles: [{id, provider}]
+          profiles: [{id, provider}],
+          canEditName: true
         });
 
         return user.save();