diff --git a/mod/contacts.php b/mod/contacts.php
index 02c75c7755..f0e677ba59 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -90,6 +90,7 @@ function contacts_content(&$a) {
 	$o = '';
 	$o .= '<script>	$(document).ready(function() { $(\'#nav-contacts-link\').addClass(\'nav-selected\'); });</script>';
 
+	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -164,7 +165,6 @@ function contacts_content(&$a) {
 			return;
 		}
 
-		$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
 		require_once('view/contact_selectors.php');
 
diff --git a/view/settings.tpl b/view/settings.tpl
index 8d0b9dfb9a..bf54a54c6d 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -3,7 +3,7 @@
 $nickname_block
 
 
-<form action="settings" id="settings-form" method="post" >
+<form action="settings" id="settings-form" method="post" autocomplete="false" >
 
 
 <h3 class="settings-heading">Basic Settings</h3>