diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -699,6 +699,7 @@ class UsersView(UserAppView):
         c.role_options = [(c.role_values, _("Role"))]
         c.user_auth_tokens = AuthTokenModel().get_auth_tokens(
             c.user.user_id, show_expired=True)
+        c.role_vcs = AuthTokenModel.cls.ROLE_VCS
         return self._get_template_context(c)
 
     def maybe_attach_token_scope(self, token):
diff --git a/rhodecode/apps/my_account/views/my_account.py b/rhodecode/apps/my_account/views/my_account.py
--- a/rhodecode/apps/my_account/views/my_account.py
+++ b/rhodecode/apps/my_account/views/my_account.py
@@ -159,6 +159,7 @@ class MyAccountView(BaseAppView, DataGri
         c.role_options = [(c.role_values, _("Role"))]
         c.user_auth_tokens = AuthTokenModel().get_auth_tokens(
             c.user.user_id, show_expired=True)
+        c.role_vcs = AuthTokenModel.cls.ROLE_VCS
         return self._get_template_context(c)
 
     def maybe_attach_token_scope(self, token):
diff --git a/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako b/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako
--- a/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako
+++ b/rhodecode/templates/admin/my_account/my_account_auth_tokens.mako
@@ -141,6 +141,12 @@ var repoFilter = function(data) {
 
 $("#scope_repo_id_disabled").select2(select2Options);
 
+var selectVcsScope = function() {
+    // select vcs scope and disable input
+    $("#role").select2("val", "${c.role_vcs}").trigger('change');
+    $("#role").select2("readonly", true)
+};
+
 $("#scope_repo_id").select2({
     cachedDataSource: {},
     minimumInputLength: 2,
@@ -174,6 +180,9 @@ var repoFilter = function(data) {
         }
     })
 });
+$("#scope_repo_id").on('select2-selecting', function(e){
+    selectVcsScope()
+});
 
 });
 </script>
diff --git a/rhodecode/templates/admin/users/user_edit_auth_tokens.mako b/rhodecode/templates/admin/users/user_edit_auth_tokens.mako
--- a/rhodecode/templates/admin/users/user_edit_auth_tokens.mako
+++ b/rhodecode/templates/admin/users/user_edit_auth_tokens.mako
@@ -139,6 +139,12 @@ var repoFilter = function(data) {
 
 $("#scope_repo_id_disabled").select2(select2Options);
 
+var selectVcsScope = function() {
+    // select vcs scope and disable input
+    $("#role").select2("val", "${c.role_vcs}").trigger('change');
+    $("#role").select2("readonly", true)
+};
+
 $("#scope_repo_id").select2({
     cachedDataSource: {},
     minimumInputLength: 2,
@@ -172,6 +178,9 @@ var repoFilter = function(data) {
        }
     })
 });
+$("#scope_repo_id").on('select2-selecting', function(e){
+    selectVcsScope()
+});
 
 });
 </script>