diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index 74e70f4..ef3e5fa 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.1.461")]
-[assembly: AssemblyFileVersion("3.0.1.461")]
+[assembly: AssemblyVersion("3.0.1.462")]
+[assembly: AssemblyFileVersion("3.0.1.462")]
diff --git a/WebApplication/AdminCategories.aspx.cs b/WebApplication/AdminCategories.aspx.cs
index 197db1f..bbbb54b 100644
--- a/WebApplication/AdminCategories.aspx.cs
+++ b/WebApplication/AdminCategories.aspx.cs
@@ -47,6 +47,8 @@ namespace ScrewTurn.Wiki {
 			lblNewCategoryResult.CssClass = "";
 			lblNewCategoryResult.Text = "";
 
+			txtNewCategory.Text = txtNewCategory.Text.Trim();
+
 			Page.Validate("newcat");
 			if(!Page.IsValid) return;
 
diff --git a/WebApplication/AdminGroups.aspx.cs b/WebApplication/AdminGroups.aspx.cs
index 30285e9..3f96d19 100644
--- a/WebApplication/AdminGroups.aspx.cs
+++ b/WebApplication/AdminGroups.aspx.cs
@@ -122,6 +122,8 @@ namespace ScrewTurn.Wiki {
 		protected void btnCreate_Click(object sender, EventArgs e) {
 			if(!Page.IsValid) return;
 
+			txtName.Text = txtName.Text.Trim();
+
 			lblResult.CssClass = "";
 			lblResult.Text = "";
 
diff --git a/WebApplication/AdminNamespaces.aspx.cs b/WebApplication/AdminNamespaces.aspx.cs
index 6a2592f..2f2f6d0 100644
--- a/WebApplication/AdminNamespaces.aspx.cs
+++ b/WebApplication/AdminNamespaces.aspx.cs
@@ -213,6 +213,8 @@ namespace ScrewTurn.Wiki {
 		}
 
 		protected void btnCreate_Click(object sender, EventArgs e) {
+			txtName.Text = txtName.Text.Trim();
+
 			Page.Validate("namespace");
 			if(!Page.IsValid) return;
 
@@ -412,6 +414,8 @@ namespace ScrewTurn.Wiki {
 			lblRenameResult.CssClass = "";
 			lblRenameResult.Text = "";
 
+			txtNewName.Text = txtNewName.Text.Trim();
+
 			Page.Validate("rename");
 			if(!Page.IsValid) return;
 
diff --git a/WebApplication/AdminNavPaths.aspx.cs b/WebApplication/AdminNavPaths.aspx.cs
index 1afa164..04ca0ae 100644
--- a/WebApplication/AdminNavPaths.aspx.cs
+++ b/WebApplication/AdminNavPaths.aspx.cs
@@ -216,6 +216,8 @@ namespace ScrewTurn.Wiki {
 		protected void btnCreate_Click(object sender, EventArgs e) {
 			if(!CanManagePagesInCurrentNamespace()) return;
 
+			txtName.Text = txtName.Text.Trim();
+
 			if(!Page.IsValid) return;
 
 			if(lstPages.Items.Count == 0) {
diff --git a/WebApplication/AdminSnippets.aspx.cs b/WebApplication/AdminSnippets.aspx.cs
index edafdfa..37630d7 100644
--- a/WebApplication/AdminSnippets.aspx.cs
+++ b/WebApplication/AdminSnippets.aspx.cs
@@ -132,6 +132,8 @@ namespace ScrewTurn.Wiki {
 
 			if(!Page.IsValid) return;
 
+			txtName.Text = txtName.Text.Trim();
+
 			if(txtCurrentElement.Value == "S") CreateSnippet();
 			else CreateTemplate();
 		}
diff --git a/WebApplication/AdminUsers.aspx.cs b/WebApplication/AdminUsers.aspx.cs
index fb397e7..9f4c004 100644
--- a/WebApplication/AdminUsers.aspx.cs
+++ b/WebApplication/AdminUsers.aspx.cs
@@ -266,6 +266,8 @@ namespace ScrewTurn.Wiki {
 		protected void btnCreate_Click(object sender, EventArgs e) {
 			if(!Page.IsValid) return;
 
+			txtUsername.Text = txtUsername.Text.Trim();
+
 			lblResult.CssClass = "";
 			lblResult.Text = "";
 
diff --git a/WebApplication/AttachmentManager.ascx.cs b/WebApplication/AttachmentManager.ascx.cs
index dbb67e8..02a36e2 100644
--- a/WebApplication/AttachmentManager.ascx.cs
+++ b/WebApplication/AttachmentManager.ascx.cs
@@ -262,6 +262,8 @@ namespace ScrewTurn.Wiki {
 			if(canDelete) {
 				lblRenameResult.Text = "";
 
+				txtNewName.Text = txtNewName.Text.Trim();
+
 				// Ensure that the extension is not changed (security)
 				string previousExtension = Path.GetExtension(lblItem.Text);
 				string newExtension = Path.GetExtension(txtNewName.Text);
@@ -274,6 +276,8 @@ namespace ScrewTurn.Wiki {
 					txtNewName.Text += previousExtension;
 				}
 
+				txtNewName.Text = txtNewName.Text.Trim();
+
 				bool done = true;
 				if(txtNewName.Text.ToLowerInvariant() != lblItem.Text.ToLowerInvariant()) {
 					done = provider.RenamePageAttachment(CurrentPage, lblItem.Text, txtNewName.Text);
diff --git a/WebApplication/Edit.aspx.cs b/WebApplication/Edit.aspx.cs
index b451aa0..c6e1e08 100644
--- a/WebApplication/Edit.aspx.cs
+++ b/WebApplication/Edit.aspx.cs
@@ -497,6 +497,8 @@ namespace ScrewTurn.Wiki {
 				txtName.Text = GenerateAutoName(txtTitle.Text);
 			}
 
+			txtName.Text = txtName.Text.Trim();
+
 			Page.Validate("nametitle");
 			Page.Validate("captcha");
 			if(!Page.IsValid) {
@@ -708,6 +710,8 @@ namespace ScrewTurn.Wiki {
 				lblCategoryResult.Text = "";
 				lblCategoryResult.CssClass = "";
 
+				txtCategory.Text = txtCategory.Text.Trim();
+
 				Page.Validate("category");
 				if(!Page.IsValid) return;
 
diff --git a/WebApplication/FileManager.ascx.cs b/WebApplication/FileManager.ascx.cs
index 930f358..5281483 100644
--- a/WebApplication/FileManager.ascx.cs
+++ b/WebApplication/FileManager.ascx.cs
@@ -461,6 +461,9 @@ namespace ScrewTurn.Wiki {
 		protected void btnRename_Click(object sender, EventArgs e) {
 			lblRenameResult.Text = "";
 			bool done = false;
+
+			txtNewName.Text = txtNewName.Text.Trim();
+
 			if(lblItem.Text.EndsWith("/")) {
 				if(canDeleteDirs) {
 					MovePermissions(CurrentDirectory + lblItem.Text, CurrentDirectory + txtNewName.Text);
@@ -487,6 +490,8 @@ namespace ScrewTurn.Wiki {
 						txtNewName.Text += previousExtension;
 					}
 
+					txtNewName.Text = txtNewName.Text.Trim();
+
 					done = true;
 					if(txtNewName.Text.ToLowerInvariant() != lblItem.Text.ToLowerInvariant()) {
 						done = provider.RenameFile(CurrentDirectory + lblItem.Text, CurrentDirectory + txtNewName.Text);
@@ -519,6 +524,8 @@ namespace ScrewTurn.Wiki {
 
 		protected void btnNewDirectory_Click(object sender, EventArgs e) {
 			if(canCreateDirs) {
+				txtNewDirectoryName.Text = txtNewDirectoryName.Text.Trim();
+
 				lblNewDirectoryResult.Text = "";
 				txtNewDirectoryName.Text = txtNewDirectoryName.Text.Trim('/');
 				AuthWriter.ClearEntriesForDirectory(provider, CurrentDirectory + txtNewDirectoryName.Text + "/");
diff --git a/WebApplication/ImageEditor.aspx.cs b/WebApplication/ImageEditor.aspx.cs
index f5edb94..cbc6075 100644
--- a/WebApplication/ImageEditor.aspx.cs
+++ b/WebApplication/ImageEditor.aspx.cs
@@ -321,6 +321,8 @@ namespace ScrewTurn.Wiki {
 			ResizeImage();
 			bool done = false;
 
+			txtNewName.Text = txtNewName.Text.Trim();
+
 			string targetName = chkNewName.Checked ? txtNewName.Text : Path.GetFileName(file);
 			bool overwrite = !chkNewName.Checked;
 
diff --git a/WebApplication/Register.aspx.cs b/WebApplication/Register.aspx.cs
index cae5fff..81cc6c4 100644
--- a/WebApplication/Register.aspx.cs
+++ b/WebApplication/Register.aspx.cs
@@ -120,6 +120,8 @@ namespace ScrewTurn.Wiki {
 		}
 		
 		protected void cvUsername_ServerValidate(object source, ServerValidateEventArgs args) {
+			txtUsername.Text = txtUsername.Text.Trim();
+
 			if(txtUsername.Text.ToLowerInvariant().Equals("admin") || txtUsername.Text.ToLowerInvariant().Equals("guest")) {
 				args.IsValid = false;
 			}