diff --git a/admin/static/js/app.js b/admin/static/js/app.js
index 39948f65..fd3912fd 100644
--- a/admin/static/js/app.js
+++ b/admin/static/js/app.js
@@ -371,11 +371,14 @@ angular.module("FICApp")
     .filter("toColor", function() {
 	return function(num) {
 	    num >>>= 0;
-	    var b = num & 0xFF,
-		g = (num & 0xFF00) >>> 8,
-		r = (num & 0xFF0000) >>> 16,
+            var b = (num & 0xFF).toString(16),
+		g = ((num & 0xFF00) >>> 8).toString(16),
+		r = ((num & 0xFF0000) >>> 16).toString(16),
 		a = ( (num & 0xFF000000) >>> 24 ) / 255 ;
-	    return "#" + r.toString(16) +  g.toString(16) +  b.toString(16);
+            if (r.length <= 1) r = "0" + r;
+            if (g.length <= 1) g = "0" + g;
+            if (b.length <= 1) b = "0" + b;
+	    return "#" + r +  g +  b;
 	}
     })
     .filter("cksum", function() {
@@ -413,11 +416,14 @@ angular.module("FICApp")
 	    link: function(scope, ele, attr, ctrl){
 		ctrl.$formatters.unshift(function(num){
 		    num >>>= 0;
-		    var b = num & 0xFF,
-			g = (num & 0xFF00) >>> 8,
-			r = (num & 0xFF0000) >>> 16,
-			a = ( (num & 0xFF000000) >>> 24 ) / 255 ;
-		    return "#" + r.toString(16) +  g.toString(16) +  b.toString(16);
+                    var b = (num & 0xFF).toString(16),
+        		g = ((num & 0xFF00) >>> 8).toString(16),
+        		r = ((num & 0xFF0000) >>> 16).toString(16),
+        		a = ( (num & 0xFF000000) >>> 24 ) / 255 ;
+                    if (r.length <= 1) r = "0" + r;
+                    if (g.length <= 1) g = "0" + g;
+                    if (b.length <= 1) b = "0" + b;
+        	    return "#" + r +  g +  b;
 		});
 		ctrl.$parsers.unshift(function(viewValue){
 		    var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(viewValue);
diff --git a/admin/static/views/team-edit.html b/admin/static/views/team-edit.html
index b448ad48..9d215896 100644
--- a/admin/static/views/team-edit.html
+++ b/admin/static/views/team-edit.html
@@ -35,7 +35,7 @@
     <label for="{{ field }}" class="col-sm-2 col-form-label-sm">{{ field | capitalize }}</label>
     <div class="col-sm-10">
       <input type="text" class="form-control form-control-sm" id="{{ field }}" ng-model="team[field]" ng-if="field != 'color'">
-      <input type="color" class="form-control form-control-sm" id="{{ field }}{{ member.id }}" ng-model="team[field]" ng-if="field == 'color'" color>
+      <input type="color" class="form-control form-control-sm" id="{{ field }}" ng-model="team[field]" ng-if="field == 'color'" color>
     </div>
   </div>
   <div class="row" ng-if="team.id">