diff --git a/app/modules/components/tags/tag-line-common/tag-line-common.controller.coffee b/app/modules/components/tags/tag-line-common/tag-line-common.controller.coffee
index 26082ae3..dde598ea 100644
--- a/app/modules/components/tags/tag-line-common/tag-line-common.controller.coffee
+++ b/app/modules/components/tags/tag-line-common/tag-line-common.controller.coffee
@@ -28,6 +28,7 @@ class TagLineCommonController
     ]
 
     constructor: (@tagLineService) ->
+        @.disableColorSelection = false
         @.newTag = {name: "", color: null}
         @.colorArray = []
         @.addTag = false
@@ -45,10 +46,14 @@ class TagLineCommonController
         @.newTag.name = ""
         @.newTag.color = null
 
-        if @.project.tags_colors[name]
-            color = @.project.tags_colors[name]
+        return if not name.length
 
-        @.onAddTag({name: name, color: color}) if name.length
+        if @.disableColorSelection
+            @.onAddTag({name: name, color: color}) if name.length
+        else
+            if @.project.tags_colors[name]
+                color = @.project.tags_colors[name]
+            @.onAddTag({name: name, color: color})
 
     selectColor: (color) ->
         @.newTag.color = color
diff --git a/app/modules/components/tags/tag-line-common/tag-line-common.directive.coffee b/app/modules/components/tags/tag-line-common/tag-line-common.directive.coffee
index 668a899f..536c229a 100644
--- a/app/modules/components/tags/tag-line-common/tag-line-common.directive.coffee
+++ b/app/modules/components/tags/tag-line-common/tag-line-common.directive.coffee
@@ -28,7 +28,9 @@ TagLineCommonDirective = () ->
             return if !project || !Object.keys(project).length
 
             unwatch()
-            ctrl.colorArray = ctrl._createColorsArray(ctrl.project.tags_colors)
+
+            if not ctrl.disableColorSelection
+                ctrl.colorArray = ctrl._createColorsArray(ctrl.project.tags_colors)
 
         el.on "keydown", ".tag-input", (event) ->
             if event.keyCode == 27 && ctrl.newTag.name.length
diff --git a/app/modules/components/tags/tag-line-common/tag-line-common.jade b/app/modules/components/tags/tag-line-common/tag-line-common.jade
index a1fd6848..e5c44ae3 100644
--- a/app/modules/components/tags/tag-line-common/tag-line-common.jade
+++ b/app/modules/components/tags/tag-line-common/tag-line-common.jade
@@ -1,6 +1,6 @@
 .tags-container
     .tag(
-        ng-if="tag[1]"
+        ng-if="tag[1] && !vm.disableColorSelection"
         ng-repeat="tag in vm.tags"
         ng-style="{'border-left': '.3rem solid' + tag[1]}"
     )
@@ -12,7 +12,7 @@
             has-permissions="{{vm.checkPermissions()}}"
         )
     .tag(
-        ng-if="!tag[1]"
+        ng-if="!tag[1] || vm.disableColorSelection"
         ng-repeat="tag in vm.tags"
     )
         tg-tag(
diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade
index 8adefd42..50a41dc9 100644
--- a/app/partials/admin/admin-project-profile.jade
+++ b/app/partials/admin/admin-project-profile.jade
@@ -75,11 +75,10 @@ div.wrapper(
 
                     tg-tag-line-common.tags-block(
                         disable-color-selection
-                        ng-if="project"
                         project="project"
                         tags="projectTags"
                         permissions="modify_project"
-                        on-add-tag="ctrl.addTag(name, color)"
+                        on-add-tag="ctrl.addTag(name)"
                         on-delete-tag="ctrl.deleteTag(tag)"
                     )