diff --git a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
index 526706aa3a..84233e59bf 100644
--- a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
+++ b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
@@ -287,7 +287,7 @@ namespace Umbraco.Core.Strings
 var UMBRACO_FORCE_SAFE_ALIAS = {0};
 var UMBRACO_FORCE_SAFE_ALIAS_URL = '{1}';
 var UMBRACO_FORCE_SAFE_ALIAS_TIMEOUT = 666;
-var UMBRACO_FORCE_SAFE_ALIAS_TIMEOUTS = {{ }};
+var UMBRACO_FORCE_SAFE_ALIAS_TMKEY = 'safe-alias-tmout';
 
 function getSafeAliasFromServer(value, callback) {{
     $.getJSON(UMBRACO_FORCE_SAFE_ALIAS_URL + 'ToSafeAlias?value=' + encodeURIComponent(value), function(json) {{
@@ -295,28 +295,30 @@ function getSafeAliasFromServer(value, callback) {{
     }});
 }}
 
-function getSafeAlias(id, value, immediate, callback) {{
+function getSafeAlias(input, value, immediate, callback) {{
     if (!UMBRACO_FORCE_SAFE_ALIAS) {{
         callback(value);
         return;
     }}
-    if (UMBRACO_FORCE_SAFE_ALIAS_TIMEOUTS[id]) clearTimeout(UMBRACO_FORCE_SAFE_ALIAS_TIMEOUTS[id]);
-    UMBRACO_FORCE_SAFE_ALIAS_TIMEOUTS[id] = setTimeout(function() {{
-        UMBRACO_FORCE_SAFE_ALIAS_TIMEOUTS[id] = null;
+    var timeout = input.data(UMBRACO_FORCE_SAFE_ALIAS_TMKEY);
+    if (timeout) clearTimeout(timeout);
+    input.data(UMBRACO_FORCE_SAFE_ALIAS_TMKEY, setTimeout(function() {{
+        input.removeData(UMBRACO_FORCE_SAFE_ALIAS_TMKEY);
         getSafeAliasFromServer(value, function(alias) {{ callback(alias); }});
-    }}, UMBRACO_FORCE_SAFE_ALIAS_TIMEOUT);
+    }}, UMBRACO_FORCE_SAFE_ALIAS_TIMEOUT));
 }}
 
-function validateSafeAlias(id, value, immediate, callback) {{
+function validateSafeAlias(input, value, immediate, callback) {{
     if (!UMBRACO_FORCE_SAFE_ALIAS) {{
         callback(true);
         return;
     }}
-    if (UMBRACO_FORCE_SAFE_ALIAS_TIMEOUTS[id]) clearTimeout(UMBRACO_FORCE_SAFE_ALIAS_TIMEOUTS[id]);
-    UMBRACO_FORCE_SAFE_ALIAS_TIMEOUTS[id] = setTimeout(function() {{
-        UMBRACO_FORCE_SAFE_ALIAS_TIMEOUTS[id] = null;
+    var timeout = input.data(UMBRACO_FORCE_SAFE_ALIAS_TMKEY);
+    if (timeout) clearTimeout(timeout);
+    input.data(UMBRACO_FORCE_SAFE_ALIAS_TMKEY, setTimeout(function() {{
+        input.removeData(UMBRACO_FORCE_SAFE_ALIAS_TMKEY);
         getSafeAliasFromServer(value, function(alias) {{ callback(value.toLowerCase() == alias.toLowerCase()); }});
-    }}, UMBRACO_FORCE_SAFE_ALIAS_TIMEOUT);
+    }}, UMBRACO_FORCE_SAFE_ALIAS_TIMEOUT));
 }}
 ";
 
diff --git a/src/Umbraco.Core/Strings/LegacyShortStringHelper.cs b/src/Umbraco.Core/Strings/LegacyShortStringHelper.cs
index 1c780703f4..901c9ee299 100644
--- a/src/Umbraco.Core/Strings/LegacyShortStringHelper.cs
+++ b/src/Umbraco.Core/Strings/LegacyShortStringHelper.cs
@@ -74,11 +74,11 @@ function safeAlias(alias) {{
     return alias;
 }}
 
-function getSafeAlias(id, value, immediate, callback) {{
+function getSafeAlias(input, value, immediate, callback) {{
     callback(safeAlias(value));
 }}
 
-function validateSafeAlias(id, value, immediate, callback) {{
+function validateSafeAlias(input, value, immediate, callback) {{
     callback(value == safeAlias(value));
 }}
 
diff --git a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
index 3a9bd18b96..6c8d26b4d6 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
@@ -114,7 +114,7 @@
 
         checkAlias('.prop-alias');
    
-        duplicatePropertyNameAsSafeAlias('ul.addNewProperty .prop-name', 'ul.addNewProperty .prop-alias');
+        duplicatePropertyNameAsSafeAlias('ul.addNewProperty');
    
         jQuery(".picker-icons").click(function(){
             var that = this;
diff --git a/src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericProperty.js b/src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericProperty.js
index 5242c9d5aa..77bfa813d9 100644
--- a/src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericProperty.js
+++ b/src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericProperty.js
@@ -12,31 +12,35 @@ function expandCollapse(theId) {
         document.getElementById("desc" + theId).style.display = 'block';
     }
 }
-function duplicatePropertyNameAsSafeAlias(nameId, aliasId) {
-    var input = $(aliasId);
-
-    $(nameId).keyup(function(event) {
-        var value = $(this).val();
-        getSafeAlias(aliasId, value, false, function (alias) {
-            input.val(alias);
+function duplicatePropertyNameAsSafeAlias(propertySelector) {
+    $(propertySelector).each(function() {
+        var prop = $(this);
+        var inputName = prop.find('.prop-name');
+        var inputAlias = prop.find('.prop-alias');
+        inputName.on('input', function (event) {
+            getSafeAlias(inputAlias, inputName.val(), false, function (alias) {
+                inputAlias.val(alias);
+            });
+        }).on('blur', function (event) {
+            $(this).off('input');
         });
     });
 }
 
-function checkAlias(aliasId) {
-    $(aliasId).keyup(function (event) {
+function checkAlias(aliasSelector) {
+    $(aliasSelector).keyup(function (event) {
         var input = $(this);
         var value = input.val();
-        validateSafeAlias(aliasId, value, false, function (isSafe) {
-            input.toggleClass('aliasValidationError', !isSafe);
+        validateSafeAlias(input, value, false, function (isSafe) {
+            input.toggleClass('highlight-error', !isSafe);
         });
     }).blur(function(event) {
         var input = $(this);
         var value = input.val();
-        getSafeAlias(aliasId, value, true, function (alias) {
+        getSafeAlias(input, value, true, function (alias) {
             if (value.toLowerCase() != alias.toLowerCase())
                 input.val(alias);
-            input.removeClass('aliasValidationError');
+            input.removeClass('highlight-error');
         });
     });
 }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
index 6f68024c79..c02c3fa8df 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
@@ -832,7 +832,7 @@ jQuery(document).ready(function() {{ refreshDropDowns(); }});
             GenericProperty gpData = gp.GenricPropertyControl;
             if (string.IsNullOrEmpty(gpData.Name.Trim()) == false && string.IsNullOrEmpty(gpData.Alias.Trim()) == false)
             {
-                var propertyTypeAlias = Casing.SafeAliasWithForcingCheck(gpData.Alias.Trim());
+                var propertyTypeAlias = gpData.Alias.ToSafeAlias();
                 if (contentTypeItem.PropertyTypeExists(propertyTypeAlias) == false)
                 {
                     //Find the DataTypeDefinition that the PropertyType should be based on
@@ -889,7 +889,7 @@ jQuery(document).ready(function() {{ refreshDropDowns(); }});
                 var propertyType = contentTypeItem.PropertyTypes.First(x => x.Alias == gpw.PropertyType.Alias);
                 if (propertyType == null) continue;
                 var dataTypeDefinition = ApplicationContext.Current.Services.DataTypeService.GetDataTypeDefinitionById(gpw.GenricPropertyControl.Type);
-                propertyType.Alias = gpw.GenricPropertyControl.Alias;
+                propertyType.Alias = gpw.GenricPropertyControl.Alias.ToSafeAlias();
                 propertyType.Name = gpw.GenricPropertyControl.Name;
                 propertyType.Description = gpw.GenricPropertyControl.Description;
                 propertyType.ValidationRegExp = gpw.GenricPropertyControl.Validation;