@@ -56,19 +56,24 @@
 	[_name release];
 	[_nameField release];
 	[_lengthField release];
 	[_legacySwitch release];
 	[_passphraseField release];
+	[_mainViewController release];
 
 	[super dealloc];
 }
 
 - (void)viewWillAppear: (BOOL)animated
 {
-	SiteStorage *siteStorage = self.mainViewController.siteStorage;
-	NSIndexPath *indexPath =
-	    self.mainViewController.tableView.indexPathForSelectedRow;
+	SiteStorage *siteStorage;
+	NSIndexPath *indexPath;
+
+	[super viewWillAppear: animated];
+
+	siteStorage = self.mainViewController.siteStorage;
+	indexPath = self.mainViewController.tableView.indexPathForSelectedRow;
 
 	[_name release];
 	_name = [self.mainViewController.sites[indexPath.row] retain];
 	_length = [siteStorage lengthForSite: _name];
 	_legacy = [siteStorage isSiteLegacy: _name];
@@ -81,10 +86,12 @@
 							 animated: YES];
 }
 
 - (void)viewDidAppear: (BOOL)animated
 {
+	[super viewDidAppear: animated];
+
 	[self.passphraseField becomeFirstResponder];
 }
 
 - (BOOL)textFieldShouldReturn: (UITextField *)textField
 {