diff --git a/phpBB/adm/style/auth_provider_oauth.html b/phpBB/adm/style/auth_provider_oauth.html
index e3e246d727..87f8716c5e 100644
--- a/phpBB/adm/style/auth_provider_oauth.html
+++ b/phpBB/adm/style/auth_provider_oauth.html
@@ -5,11 +5,11 @@
 	<legend>{oauth_services.ACTUAL_NAME}</legend>
 	<dl>
 		<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label><br /><span>{L_AUTH_PROVIDER_OAUTH_KEY_EXPLAIN}</span></dt>
-		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{AUTH_LDAP_SERVER}" /></dd>
+		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{oauth_services.KEY}" /></dd>
 	</dl>
 	<dl>
 		<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label><br /><span>{L_AUTH_PROVIDER_OAUTH_SECRET_EXPLAIN}</span></dt>
-		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{AUTH_LDAP_SERVER}" /></dd>
+		<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{oauth_services.SECRET}" /></dd>
 	</dl>
 </fieldset>
 <!-- END oauth_services -->
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php
index 31450a573f..6ad0293e8e 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -271,9 +271,12 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
 		foreach ($this->service_providers as $service_name => $service_provider)
 		{
 			$actual_name = str_replace('auth.provider.oauth.service.', '', $service_name);
-			$ret['TEMPLATE_VARS'][$actual_name] = array();
-			$ret['TEMPLATE_VARS'][$actual_name]['NAME'] = $actual_name;
-			$ret['TEMPLATE_VARS'][$actual_name]['ACTUAL_NAME'] = 'L_AUTH_PROVIDER_OAUTH_SERVICE_' . strtoupper($actual_name);
+			$ret['TEMPLATE_VARS'][$actual_name] = array(
+				'ACTUAL_NAME'	=> 'L_AUTH_PROVIDER_OAUTH_SERVICE_' . strtoupper($actual_name),
+				'KEY'			=> $new_config['auth_oauth_' . $actual_name . '_key'],
+				'NAME'			=> $actual_name,
+				'SECRET'		=> $new_config['auth_oauth_' . $actual_name . '_secret'],
+			);
 		}
 
 		return $ret;