diff --git a/_sakura/templates/misaki/main/profile.tpl b/_sakura/templates/misaki/main/profile.tpl
index 4a63d12..249a581 100755
--- a/_sakura/templates/misaki/main/profile.tpl
+++ b/_sakura/templates/misaki/main/profile.tpl
@@ -91,7 +91,7 @@
                         <div class="profilePlatform userActions">
                             <div class="inner">
                                 <ul class="actions">
-                                    {% if user.user_id == profile.user_id %}
+                                    {% if user.id == profile.id %}
                                         <li class="edit"><a title="Edit your profile" href="{{ urls.format('SETTING_MODE', ['general', 'profile']) }}">Edit</a></li>
                                         <li class="settings"><a title="Change your settings" href="{{ urls.format('SETTINGS_INDEX') }}">Settings</a></li>
                                     {% else %}
diff --git a/_sakura/templates/yuuno/global/master.tpl b/_sakura/templates/yuuno/global/master.tpl
index 42ba5a2..2746c47 100755
--- a/_sakura/templates/yuuno/global/master.tpl
+++ b/_sakura/templates/yuuno/global/master.tpl
@@ -268,7 +268,7 @@
                 </div>
             </div>
         </div>
-        {% if not sakura.versionInfo.stable and php.self == '/index.php' and not page.id %}
+        {% if not sakura.versionInfo.stable and php.self == '/index.php' and stats %}
         <script type="text/javascript" src="https://sakura.flash.moe/?get={{ sakura.versionInfo.version|slice(0, 4) }}-{{ sakura.versionInfo.version|slice(4, 2) }}-{{ sakura.versionInfo.version|slice(6, 2) }}&amp;variable=true"></script>
         <script type="text/javascript">
             // Column colours for actions
diff --git a/_sakura/templates/yuuno/settings/appearance.avatar.tpl b/_sakura/templates/yuuno/settings/appearance.avatar.tpl
index a484b23..5d350cb 100755
--- a/_sakura/templates/yuuno/settings/appearance.avatar.tpl
+++ b/_sakura/templates/yuuno/settings/appearance.avatar.tpl
@@ -5,7 +5,7 @@
     <input type="hidden" name="MAX_FILE_SIZE" value="{{ avatar.max_size }}" />
     <div style="text-align: center;">
         <div>
-            <img src="/a/{{ user.data.user_id }}" alt="Your Avatar" class="default-avatar-setting" />
+            <img src="/a/{{ user.id }}" alt="Your Avatar" class="default-avatar-setting" />
         </div>
         <div>
             <input type="file" name="avatar" />
diff --git a/public/authenticate.php b/public/authenticate.php
index 5715a93..223fa5e 100755
--- a/public/authenticate.php
+++ b/public/authenticate.php
@@ -203,7 +203,7 @@ if (isset($_REQUEST['mode'])) {
                 // Add page specific things
                 $renderData['page'] = [
 
-                    'redirect' => $login[0] ? ($currentUser->dates()['lastOnline'] ? $_REQUEST['redirect'] : $urls->format('INFO_PAGE', ['welcome'])) : $urls->format('SITE_LOGIN'),
+                    'redirect' => $login[0] ? ((new User($login[2]))->dates()['lastOnline'] ? $_REQUEST['redirect'] : $urls->format('INFO_PAGE', ['welcome'])) : $urls->format('SITE_LOGIN'),
                     'message' => $messages[$login[1]],
                     'success' => $login[0],