diff --git a/app/assets/javascripts/new_branch_form.js.coffee b/app/assets/javascripts/new_branch_form.js.coffee
index 6b01bb0ce21..23a5b333b8a 100644
--- a/app/assets/javascripts/new_branch_form.js.coffee
+++ b/app/assets/javascripts/new_branch_form.js.coffee
@@ -34,13 +34,19 @@ class @NewBranchForm
       conjunction: "or"
     }
 
-    characters = {
+    invalid = {
       pattern: /(\s|~|\^|:|\?|\*|\[|\\|\.\.|@\{|\/{2,}){1}/g
       prefix: "can't contains",
       conjunction: ", "
     }
 
-    @restrictions = [startsWith, characters, endsWith]
+    single = {
+      pattern: /^@+$/g
+      prefix: "can't be",
+      conjunction: "or"
+    }
+
+    @restrictions = [startsWith, invalid, endsWith, single]
 
   validate: =>
     @branchNameError.empty()