diff --git a/phpBB/phpbb/auth/provider/oauth/token_storage.php b/phpBB/phpbb/auth/provider/oauth/token_storage.php
index ec54c07fea..de99f9bd31 100644
--- a/phpBB/phpbb/auth/provider/oauth/token_storage.php
+++ b/phpBB/phpbb/auth/provider/oauth/token_storage.php
@@ -87,7 +87,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
 		}
 
 		$data = array(
-			'user_id'			=> $this->user->data['user_id'],
+			'user_id'	=> $this->user->data['user_id'],
 			'provider'	=> $this->service_name,
 		);
 
@@ -130,9 +130,9 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
 		$this->cachedToken = $token;
 
 		$data = array(
-			'user_id'			=> $this->user->data['user_id'],
-			'provider'	=> $this->service_name,
-			'oauth_token'		=> serialize($token),
+			'user_id'		=> $this->user->data['user_id'],
+			'provider'		=> $this->service_name,
+			'oauth_token'	=> serialize($token),
 		);
 
 		if ($this->user->data['user_id'] == ANONYMOUS)
@@ -155,7 +155,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
 		}
 
 		$data = array(
-			'user_id'			=> $this->user->data['user_id'],
+			'user_id'	=> $this->user->data['user_id'],
 			'provider'	=> $this->service_name,
 		);
 
@@ -187,7 +187,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
 
 		$sql = 'DELETE FROM ' . $this->auth_provider_oauth_table . '
 			WHERE user_id = ' . $this->user->data['user_id'] . '
-				AND provider = ' . $this->db->sql_escape($this->oauth_provider);
+				AND provider = \'' . $this->db->sql_escape($this->oauth_provider) . '\'';
 
 		if ($this->user->data['user_id'] == ANONYMOUS)
 		{
diff --git a/tests/auth/provider_oauth_token_storage_test.php b/tests/auth/provider_oauth_token_storage_test.php
index 1d5505ee8e..fced3184df 100644
--- a/tests/auth/provider_oauth_token_storage_test.php
+++ b/tests/auth/provider_oauth_token_storage_test.php
@@ -151,4 +151,4 @@ class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_c
 
 		return $row;
 	}
-}
\ No newline at end of file
+}