diff --git a/phpBB/phpbb/auth/provider/oauth/service/base.php b/phpBB/phpbb/auth/provider/oauth/service/base.php
index 566b77202a..5ab426a0aa 100644
--- a/phpBB/phpbb/auth/provider/oauth/service/base.php
+++ b/phpBB/phpbb/auth/provider/oauth/service/base.php
@@ -44,16 +44,16 @@ abstract class base implements service_interface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function set_external_service_provider(\OAuth\Common\Service\ServiceInterface $service_provider)
+	public function get_external_service_provider()
 	{
-		$this->service_provider = $service_provider;
+		return $this->service_provider;
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function get_external_service_provider()
+	public function set_external_service_provider(\OAuth\Common\Service\ServiceInterface $service_provider)
 	{
-		return $this->service_provider;
+		$this->service_provider = $service_provider;
 	}
 }
diff --git a/phpBB/phpbb/auth/provider/oauth/service/service_interface.php b/phpBB/phpbb/auth/provider/oauth/service/service_interface.php
index 8d92a3725e..ea9ef43788 100644
--- a/phpBB/phpbb/auth/provider/oauth/service/service_interface.php
+++ b/phpBB/phpbb/auth/provider/oauth/service/service_interface.php
@@ -71,17 +71,17 @@ interface service_interface
 	 */
 	public function get_external_service_class();
 
-	/**
-	 * Sets the external library service provider
-	 *
-	 * @param \OAuth\Common\Service\ServiceInterface	$service_provider
-	 */
-	public function set_external_service_provider(\OAuth\Common\Service\ServiceInterface $service_provider);
-
 	/**
 	 * Returns the external library service provider once it has been set
 	 *
 	 * @param \OAuth\Common\Service\ServiceInterface|null
 	 */
 	public function get_external_service_provider();
+
+	/**
+	 * Sets the external library service provider
+	 *
+	 * @param \OAuth\Common\Service\ServiceInterface	$service_provider
+	 */
+	public function set_external_service_provider(\OAuth\Common\Service\ServiceInterface $service_provider);
 }