diff --git a/webadmin/src/views/account.html b/webadmin/src/views/account.html
index 78069ecb7..2de8f6ca3 100644
--- a/webadmin/src/views/account.html
+++ b/webadmin/src/views/account.html
@@ -122,7 +122,7 @@
                             <small ng-show="clientAddForm.scope.$error.required">A scope is required</small>
                             <small ng-show="!clientAddForm.scope.$dirty && clientAdd.error.scope">{{ clientAdd.error.scope }}</small>
                         </div>
-                        <input type="text" class="form-control" ng-model="clientAdd.scope" name="scope" required>
+                        <input type="text" class="form-control" ng-model="clientAdd.scope" name="scope" id="clientAddScope" required>
                     </div>
                     <div class="form-group" ng-class="{ 'has-error': (clientAddForm.redirectURI.$dirty && clientAddForm.redirectURI.$invalid) || (!clientAddForm.redirectURI.$dirty && clientAdd.error.redirectURI) }">
                         <label class="control-label">Redirect URI</label>
diff --git a/webadmin/src/views/account.js b/webadmin/src/views/account.js
index 17308f1a2..946357b33 100644
--- a/webadmin/src/views/account.js
+++ b/webadmin/src/views/account.js
@@ -191,8 +191,12 @@ angular.module('Application').controller('AccountController', ['$scope', '$locat
                         $scope.clientAdd.error.redirectURI = error.message;
                         $scope.clientAddForm.redirectURI.$setPristine();
                         $('#clientAddRedirectURI').focus();
+                    } else if (error.message.indexOf('Invalid scope') === 0) {
+                        $scope.clientAdd.error.scope = error.message;
+                        $scope.clientAddForm.scope.$setPristine();
+                        $('#clientAddScope').focus();
                     } else {
-                        // TODO scope checking
+                        console.error(error);
                     }
                     return;
                 }