diff --git a/src/Umbraco.Core/Services/Implement/FileService.cs b/src/Umbraco.Core/Services/Implement/FileService.cs
index 26a24e9b98..ce8600d798 100644
--- a/src/Umbraco.Core/Services/Implement/FileService.cs
+++ b/src/Umbraco.Core/Services/Implement/FileService.cs
@@ -405,6 +405,21 @@ namespace Umbraco.Core.Services.Implement
         /// <returns></returns>
         public ITemplate CreateTemplateWithIdentity(string name, string alias, string content, ITemplate masterTemplate = null, int userId = Constants.Security.SuperUserId)
         {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            if (string.IsNullOrWhiteSpace(name)) 
+            {
+                throw new ArgumentException("Name cannot be empty or contain only white-space characters", nameof(name));
+            }
+
+            if (name.Length > 255)
+            {
+                throw new ArgumentOutOfRangeException(nameof(name), "Name cannot be more than 255 characters in length.");
+            }
+
             // file might already be on disk, if so grab the content to avoid overwriting
             var template = new Template(name, alias)
             {
@@ -539,6 +554,17 @@ namespace Umbraco.Core.Services.Implement
         /// <param name="userId"></param>
         public void SaveTemplate(ITemplate template, int userId = Constants.Security.SuperUserId)
         {
+            if (template == null)
+            {
+                throw new ArgumentNullException(nameof(template));
+            }
+            
+            if (string.IsNullOrWhiteSpace(template.Name) || template.Name.Length > 255)
+            {
+                throw new InvalidOperationException("Name cannot be null, empty, contain only white-space characters or be more than 255 characters in length.");
+            }
+
+
             using (var scope = ScopeProvider.CreateScope())
             {
                 if (scope.Events.DispatchCancelable(SavingTemplate, this, new SaveEventArgs<ITemplate>(template)))
diff --git a/src/Umbraco.Core/Services/Implement/MemberService.cs b/src/Umbraco.Core/Services/Implement/MemberService.cs
index 8c69664712..280241e342 100644
--- a/src/Umbraco.Core/Services/Implement/MemberService.cs
+++ b/src/Umbraco.Core/Services/Implement/MemberService.cs
@@ -816,8 +816,8 @@ namespace Umbraco.Core.Services.Implement
         {
             //trimming username and email to make sure we have no trailing space
             member.Username = member.Username.Trim();
-            member.Email = member.Email.Trim();
-
+            member.Email = member.Email.Trim();         
+            
             using (var scope = ScopeProvider.CreateScope())
             {
                 var saveEventArgs = new SaveEventArgs<IMember>(member);
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
index 2d638dd00d..5aba520b9b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
@@ -54,7 +54,7 @@
                 </div>
 
                 <umb-control-group label="Enter a folder name" hide-label="false">
-                    <input type="text" name="folderName" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
+                    <input type="text" name="folderName" maxlength="255" ng-model="model.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
                 </umb-control-group>
 
                 <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
@@ -81,7 +81,7 @@
 
                 <umb-control-group>
                     <label for="collectionName" class="control-label">Name of the Parent Document Type</label>
-                    <input type="text" name="collectionName" id="collectionName" ng-model="model.collectionName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
+                    <input type="text" name="collectionName" id="collectionName" ng-model="model.collectionName" maxlength="255" class="umb-textstring textstring input-block-level" umb-auto-focus required />
 
                     <umb-checkbox ng-if="model.disableTemplates === false"
                                   name="collectionCreateTemplate"
@@ -91,7 +91,7 @@
 
                 <umb-control-group>
                     <label for="collectionItemName" class="control-label">Name of the Item Document Type</label>
-                    <input type="text" name="collectionItemName" id="collectionItemName" ng-model="model.collectionItemName" class="umb-textstring textstring input-block-level" required />
+                    <input type="text" name="collectionItemName" id="collectionItemName" ng-model="model.collectionItemName" maxlength="255" class="umb-textstring textstring input-block-level" required />
 
                     <umb-checkbox ng-if="model.disableTemplates === false"
                                   name="collectionItemCreateTemplate"