diff --git a/src/oauth2views/account_setup.ejs b/src/oauth2views/account_setup.ejs
index ae8634577..89c5b6469 100644
--- a/src/oauth2views/account_setup.ejs
+++ b/src/oauth2views/account_setup.ejs
@@ -28,6 +28,12 @@ app.controller('Controller', [function () {}]);
 
                 <center><p class="has-error"><%= error %></p></center>
 
+<% if (user && user.username) { %>
+                <div class="form-group"">
+                    <label class="control-label">Username</label>
+                    <input type="text" class="form-control" disabled value="<%= user.username %>">
+                </div>
+<% } else { %>
                 <div class="form-group" ng-class="{ 'has-error': (setupForm.username.$dirty && setupForm.username.$invalid) }">
                     <label class="control-label">Username</label>
                     <div class="control-label" ng-show="setupForm.username.$dirty && setupForm.username.$invalid">
@@ -37,10 +43,11 @@ app.controller('Controller', [function () {}]);
                     </div>
                     <input type="text" class="form-control" ng-model="username" name="username" ng-maxlength="512" ng-minlength="3" required autofocus>
                 </div>
+<% } %>
 
                 <div class="form-group">
                     <label class="control-label">Display Name</label>
-                    <input type="displayName" class="form-control" ng-model="displayName" name="displayName" required>
+                    <input type="displayName" class="form-control" ng-model="displayName" name="displayName" value="<%= (user && user.displayName) ? user.displayName : '' %>" required>
                 </div>
 
                 <div class="form-group" ng-class="{ 'has-error': (setupForm.password.$dirty && setupForm.password.$invalid) }">