diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 780a336fce..72f8ad5539 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -46,7 +46,7 @@ function entityResource($q, $http, umbRequestHelper) {
                $http.get(
                    umbRequestHelper.getApiUrl(
                        "entityApiBaseUrl",
-                        "GetSafeAlias", { value: encodeURIComponent(value), camelCase: camelCase })),
+                       "GetSafeAlias", { value: value, camelCase: camelCase })),
                'Failed to retrieve content type scaffold');
         },
 
diff --git a/src/Umbraco.Web/Editors/TemplateController.cs b/src/Umbraco.Web/Editors/TemplateController.cs
index e38f08665e..100a266dff 100644
--- a/src/Umbraco.Web/Editors/TemplateController.cs
+++ b/src/Umbraco.Web/Editors/TemplateController.cs
@@ -184,7 +184,7 @@ namespace Umbraco.Web.Editors
                         throw new HttpResponseException(HttpStatusCode.NotFound);
                 }
 
-                var template = Services.FileService.CreateTemplateWithIdentity(display.Alias, display.Content, master);
+                var template = Services.FileService.CreateTemplateWithIdentity(display.Name, display.Content, master);
                 Mapper.Map(template, display);
             }