diff --git a/webadmin/src/views/account.html b/webadmin/src/views/account.html
index 1f0af4739..782e4b820 100644
--- a/webadmin/src/views/account.html
+++ b/webadmin/src/views/account.html
@@ -198,7 +198,7 @@
     <div class="grid-item-top">
         <div class="row">
             <div class="col-xs-12">
-                <h4 class="text-muted">{{client.name}} on {{client.location}}{{ config.isCustomDomain ? '.' : '-' }}{{config.fqdn}}</h4>
+                <h4 class="text-muted">{{client.name}} <span ng-show="client.location !== 'external'">on {{client.location}}{{ config.isCustomDomain ? '.' : '-' }}{{config.fqdn}}</span></h4>
             </div>
         </div>
         <div class="row">
@@ -208,7 +208,7 @@
                         You logged in <b>{{ client.tokenCount }}</b> times to this application.
                         <button class="btn btn-xs btn-danger pull-right" ng-click="removeAccessTokens(client)" ng-disabled="!client.tokenCount || client.busy"><i class="fa fa-spinner fa-pulse" ng-show="client.busy"></i> Remove access</button>
                         <br/>
-                        <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#collapse{{client.id}}">Advanced</a>
+                        <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#collapse{{client.id}}" ng-show="user.admin">Advanced</a>
                         <div id="collapse{{client.id}}" class="panel-collapse collapse">
                             <div class="panel-body">
                                 <h4 class="text-muted">Credentials</h4>