diff --git a/include/nav.php b/include/nav.php
index d4f22e7ee7..2c9c643a92 100755
--- a/include/nav.php
+++ b/include/nav.php
@@ -69,9 +69,9 @@ function nav(&$a) {
 	 * "Home" should also take you home from an authenticated remote profile connection
 	 */
 
-	$homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
-	if(get_my_url())
-		$homelink = get_my_url();
+	$homelink = get_my_url();
+	if(! $homelink)
+		$homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
 
 	if(($a->module != 'home') && (! (local_user()))) 
 		$nav['home'] = array($homelink, t('Home'), "", t('Home Page'));
diff --git a/index.php b/index.php
index d4587b754c..2faac1f289 100755
--- a/index.php
+++ b/index.php
@@ -93,8 +93,8 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 	load_translation_table($lang);
 }
 
-if(x($_GET,'zurl')) {
-	$_SESSION['my_url'] = $_GET['zurl'];
+if(x($_GET,'zrl')) {
+	$_SESSION['my_url'] = $_GET['zrl'];
 }
 
 /**