diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index 3b7cded..ca5ca43 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.428")]
-[assembly: AssemblyFileVersion("3.0.1.428")]
+[assembly: AssemblyVersion("3.0.1.429")]
+[assembly: AssemblyFileVersion("3.0.1.429")]
diff --git a/WebApplication/AttachmentManager.ascx.cs b/WebApplication/AttachmentManager.ascx.cs
index bc17ac5..dbb67e8 100644
--- a/WebApplication/AttachmentManager.ascx.cs
+++ b/WebApplication/AttachmentManager.ascx.cs
@@ -70,14 +70,7 @@ namespace ScrewTurn.Wiki {
 			}
 
 			DetectPermissions();
-
-			// Setup buttons and controls
-			if(!canUpload) {
-				btnUpload.Enabled = false;
-			}
-			if(!canDelete) {
-				chkOverwrite.Enabled = false;
-			}
+			SetupControls();
 		}
 
 		/// <summary>
@@ -101,6 +94,18 @@ namespace ScrewTurn.Wiki {
 			lstProviders.Visible = isAdmin;
 		}
 
+		/// <summary>
+		/// Sets up buttons and controls using the permissions.
+		/// </summary>
+		private void SetupControls() {
+			if(!canUpload) {
+				btnUpload.Enabled = false;
+			}
+			if(!canDelete) {
+				chkOverwrite.Enabled = false;
+			}
+		}
+
 		/// <summary>
 		/// Gets or sets the PageInfo object.
 		/// </summary>
@@ -113,6 +118,7 @@ namespace ScrewTurn.Wiki {
 				btnUpload.Enabled = value != null;
 				lblNoUpload.Visible = !btnUpload.Enabled;
 				DetectPermissions();
+				SetupControls();
 				rptItems.DataBind();
 			}
 		}
diff --git a/WebApplication/Edit.aspx.cs b/WebApplication/Edit.aspx.cs
index 0e89955..0315ebc 100644
--- a/WebApplication/Edit.aspx.cs
+++ b/WebApplication/Edit.aspx.cs
@@ -426,6 +426,7 @@ namespace ScrewTurn.Wiki {
 		}
 
 		protected void btnCancel_Click(object sender, EventArgs e) {
+			if(currentPage == null && txtName.Visible) currentPage = Pages.FindPage(NameTools.GetFullName(DetectNamespace(), txtName.Text));
 			if(currentPage != null) UrlTools.Redirect(Tools.UrlEncode(currentPage.FullName) + Settings.PageExtension);
 			else UrlTools.Redirect(UrlTools.BuildUrl("Default.aspx"));
 		}
@@ -566,6 +567,7 @@ namespace ScrewTurn.Wiki {
 					Pages.CreatePage(DetectNamespaceInfo(), txtName.Text, provider);
 					pg = Pages.FindPage(NameTools.GetFullName(DetectNamespace(), txtName.Text), provider);
 					saveMode = SaveMode.Normal;
+					attachmentManager.CurrentPage = pg;
 				}
 				Log.LogEntry("Page update requested for " + txtName.Text, EntryType.General, username);