diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 372eecbb57..0c49cd1a5c 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -417,7 +417,7 @@ class ucp_register
 				}
 
 				// Perform account linking if necessary
-				if ($login_link_data !== array())
+				if (!empty($login_link_data))
 				{
 					$login_link_data['user_id'] = $user_id;
 
diff --git a/phpBB/styles/prosilver/template/login_body_oauth.html b/phpBB/styles/prosilver/template/login_body_oauth.html
index dbbe011c58..156485d211 100644
--- a/phpBB/styles/prosilver/template/login_body_oauth.html
+++ b/phpBB/styles/prosilver/template/login_body_oauth.html
@@ -4,5 +4,5 @@
 		<dt>&nbsp;</dt>
 		<dd><a href="{oauth.REDIRECT_URL}" class="button2">{oauth.SERVICE_NAME}</a></dd>
 	</dl>
-<!-- END oauth -->
+	<!-- END oauth -->
 </div>
diff --git a/phpBB/styles/prosilver/template/ucp_login_link.html b/phpBB/styles/prosilver/template/ucp_login_link.html
index baf7d56176..d3c6931ce3 100644
--- a/phpBB/styles/prosilver/template/ucp_login_link.html
+++ b/phpBB/styles/prosilver/template/ucp_login_link.html
@@ -18,7 +18,7 @@
 			<fieldset class="fields1">
 				<dl>
 					<dt>&nbsp;</dt>
-					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="register" tabindex="6" value="{L_REGISTER}" class="button1" /></dd>
+					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="register" tabindex="1" value="{L_REGISTER}" class="button1" /></dd>
 				</dl>
 			</fieldset>
 		</form>
@@ -32,21 +32,21 @@
 				<!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF -->
 				<dl>
 					<dt><label for="{USERNAME_CREDENTIAL}">{L_USERNAME}{L_COLON}</label></dt>
-					<dd><input type="text" tabindex="1" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{LOGIN_USERNAME}" class="inputbox autowidth" /></dd>
+					<dd><input type="text" tabindex="2" name="{USERNAME_CREDENTIAL}" id="{USERNAME_CREDENTIAL}" size="25" value="{LOGIN_USERNAME}" class="inputbox autowidth" /></dd>
 				</dl>
 				<dl>
 					<dt><label for="{PASSWORD_CREDENTIAL}">{L_PASSWORD}{L_COLON}</label></dt>
-					<dd><input type="password" tabindex="2" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
+					<dd><input type="password" tabindex="3" id="{PASSWORD_CREDENTIAL}" name="{PASSWORD_CREDENTIAL}" size="25" class="inputbox autowidth" /></dd>
 				</dl>
 				<!-- IF CAPTCHA_TEMPLATE and S_CONFIRM_CODE -->
-					<!-- DEFINE $CAPTCHA_TAB_INDEX = 3 -->
+					<!-- DEFINE $CAPTCHA_TAB_INDEX = 4 -->
 					<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
 				<!-- ENDIF -->
 
 				{S_LOGIN_REDIRECT}
 				<dl>
 					<dt>&nbsp;</dt>
-					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd>
+					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1" /></dd>
 				</dl>
 			</fieldset>
 		</form>
diff --git a/tests/auth/provider_oauth_token_storage_test.php b/tests/auth/provider_oauth_token_storage_test.php
index 223d4dfb93..401f049405 100644
--- a/tests/auth/provider_oauth_token_storage_test.php
+++ b/tests/auth/provider_oauth_token_storage_test.php
@@ -197,7 +197,7 @@ class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_c
 	{
 		// Test that the token is stored in the database
 		$sql = 'SELECT * FROM phpbb_oauth_tokens 
-			WHERE session_id = \'' . $session_id . '\'';
+			WHERE session_id = \'' . $this->db->sql_escape($session_id) . '\'';
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);