diff --git a/apps/oauth2/lib/Controller/OauthApiController.php b/apps/oauth2/lib/Controller/OauthApiController.php
index 97f8185149..b97d85ae3e 100644
--- a/apps/oauth2/lib/Controller/OauthApiController.php
+++ b/apps/oauth2/lib/Controller/OauthApiController.php
@@ -81,7 +81,7 @@ class OauthApiController extends Controller {
 				'token_type' => 'Bearer',
 				'expires_in' => 3600,
 				'refresh_token' => $newCode,
-				'user_id' => ($this->defaultTokenMapper->getTokenById($accessToken->getTokenId()))->getUID(),
+				'user_id' => $this->defaultTokenMapper->getTokenById($accessToken->getTokenId())->getUID(),
 			]
 		);
 	}
diff --git a/apps/oauth2/templates/admin.php b/apps/oauth2/templates/admin.php
index 9c09499add..d2e34e08db 100644
--- a/apps/oauth2/templates/admin.php
+++ b/apps/oauth2/templates/admin.php
@@ -45,12 +45,15 @@ $clients = $_['clients'];
 		</tr>
 		</thead>
 		<tbody>
-		<?php foreach ($clients as $client) { ?>
+		<?php
+		$imageUrl = $urlGenerator->imagePath('core', 'actions/toggle.svg');
+		foreach ($clients as $client) {
+		?>
 			<tr>
 				<td><?php p($client->getName()); ?></td>
 				<td><?php p($client->getRedirectUri()); ?></td>
 				<td><code><?php p($client->getClientIdentifier()); ?></code></td>
-				<td data-value="<?php p($client->getSecret()); ?>"><code>****</code><img class='show-oauth-credentials' src="<?php p($urlGenerator->imagePath('core', 'actions/toggle.svg'));?>"/></td>
+				<td data-value="<?php p($client->getSecret()); ?>"><code>****</code><img class='show-oauth-credentials' src="<?php p($imageUrl); ?>"/></td>
 				<td>
 					<form id="form-inline" class="delete" action="<?php p($urlGenerator->linkToRoute('oauth2.Settings.deleteClient', ['id' => $client->getId()])); ?>" method="POST">
 						<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />