diff --git a/src/js/setupaccount.js b/src/js/setupaccount.js
index 593c981ba..d359f28ef 100644
--- a/src/js/setupaccount.js
+++ b/src/js/setupaccount.js
@@ -35,6 +35,7 @@ app.controller('SetupAccountController', ['$scope', '$http', function ($scope, $
     $scope.view = 'setup';
     $scope.status = null;
 
+    $scope.profileLocked = !!search.profileLocked;
     $scope.existingUsername = !!search.username;
     $scope.username = search.username || '';
     $scope.displayName = search.displayName || '';
@@ -47,11 +48,14 @@ app.controller('SetupAccountController', ['$scope', '$http', function ($scope, $
 
         var data = {
             resetToken: search.resetToken,
-            username: $scope.username,
-            displayName: $scope.displayName,
             password: $scope.password
         };
 
+        if (!$scope.profileLocked) {
+            data.username = $scope.username;
+            data.displayName = $scope.displayName;
+        }
+
         function error(data, status) {
             $scope.busy = false;
 
diff --git a/src/setupaccount.html b/src/setupaccount.html
index 61337e17e..4699cf95f 100644
--- a/src/setupaccount.html
+++ b/src/setupaccount.html
@@ -68,23 +68,19 @@
           <form name="setupAccountForm" ng-submit="onSubmit()" autocomplete="off">
             <input type="password" style="display: none;">
 
-            <div class="form-group" ng-show="existingUsername">
-              <label class="control-label">Username</label>
-              <input type="text" class="form-control" ng-model="username" name="username" readonly required>
-            </div>
-            <div class="form-group" ng-class="{ 'has-error': ((setupAccountForm.username.$dirty && setupAccountForm.username.$invalid) || (!setupAccountForm.username.$dirty && error.username))}" ng-hide="existingUsername">
+            <div class="form-group" ng-class="{ 'has-error': ((setupAccountForm.username.$dirty && setupAccountForm.username.$invalid) || (!setupAccountForm.username.$dirty && error.username))}">
               <label class="control-label">Username</label>
               <div class="control-label" ng-show="setupAccountForm.username.$dirty && setupAccountForm.username.$invalid">
               <small ng-show="setupAccountForm.username.$error.minlength">The username is too short</small>
               <small ng-show="setupAccountForm.username.$error.maxlength">The username is too long</small>
               <small ng-show="setupAccountForm.username.$dirty && setupAccountForm.username.$invalid">Not a valid username</small>
               </div>
-              <input type="text" class="form-control" ng-model="username" name="username" id="inputUsername" required autofocus>
+              <input type="text" class="form-control" ng-model="username" name="username" id="inputUsername" ng-disabled="profileLocked || existingUsername" required autofocus>
             </div>
 
             <div class="form-group">
               <label class="control-label">Full 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" ng-disabled="profileLocked" required>
             </div>
 
             <div class="form-group" ng-class="{ 'has-error': (setupAccountForm.password.$dirty && setupAccountForm.password.$invalid) }">