diff --git a/library/includes/ucp/viewprofile.php b/library/includes/ucp/viewprofile.php
index 15c540085..1df5f6256 100644
--- a/library/includes/ucp/viewprofile.php
+++ b/library/includes/ucp/viewprofile.php
@@ -18,15 +18,16 @@ $datastore->enqueue(array(
     'cat_forums',
 ));
 
-if (empty($_GET[POST_USERS_URL]) || $_GET[POST_USERS_URL] == GUEST_UID) {
-    bb_die($lang['NO_USER_ID_SPECIFIED']);
-}
-if (!$profiledata = get_userdata($_GET[POST_USERS_URL])) {
-    bb_die($lang['NO_USER_ID_SPECIFIED']);
-}
-
 if (!$userdata['session_logged_in']) {
     redirect(LOGIN_URL . "?redirect={$_SERVER['REQUEST_URI']}");
+} else {
+    if (empty($_GET[POST_USERS_URL])) {
+        $_GET[POST_USERS_URL] = $userdata['user_id'];
+    }
+}
+
+if (!$profiledata = get_userdata($_GET[POST_USERS_URL])) {
+    bb_die($lang['NO_USER_ID_SPECIFIED']);
 }
 
 if (!$ranks = $datastore->get('ranks')) {
diff --git a/profile.php b/profile.php
index dfd86e4a1..627b4dd73 100644
--- a/profile.php
+++ b/profile.php
@@ -16,7 +16,7 @@ require __DIR__ . '/common.php';
 $user->session_start();
 
 set_die_append_msg();
-$mode = request_var('mode', '');
+$mode = request_var('mode', 'viewprofile');
 
 switch ($mode) {
     case 'viewprofile':