diff --git a/mod/manage.php b/mod/manage.php
index bfa4d1475c..c0eedc2ba0 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -97,6 +97,12 @@ function manage_content(&$a) {
 		return;
 	}
 
+	if ($_GET['identity']) {
+		$_POST['identity'] = $_GET['identity'];
+		manage_post($a);
+		return;
+	}
+
 	$identities = $a->identities;
 
 	//getting additinal information for each identity
diff --git a/view/templates/manage.tpl b/view/templates/manage.tpl
index b1ccff5195..e23c402754 100644
--- a/view/templates/manage.tpl
+++ b/view/templates/manage.tpl
@@ -9,7 +9,7 @@
 	{{foreach $identities as $id}}
 		<div class="itentity-match-wrapper {{if $id.selected}}selected-identity{{/if}}" id="identity-match-{{$id.uid}}">
 			<div class="identity-match-photo" id="identity-match-photo-{{$id.uid}}">
-				<button role="menuitem" name="identity" value="{{$id.uid}}" onclick="this.form.submit();" title="{{$id.username}}">
+				<button name="identity" value="{{$id.uid}}" onclick="this.form.submit();" title="{{$id.username}}">
 					<img src="{{$id.thumb}}" alt="{{$id.username}}" />
 				</button>
 			</div>
@@ -17,7 +17,9 @@
 			<div class="identity-match-break"></div>
 
 			<div class="identity-match-desc">
-				<div class="identity-match-name" id="identity-match-name-{{$id.uid}}">{{$id.username}}</div>
+				<div class="identity-match-name" id="identity-match-name-{{$id.uid}}">
+					{{if $id.selected}}{{$id.username}}{{else}}<a role="menuitem" href="manage?identity={{$id.uid}}">{{$id.username}}</a>{{/if}}
+				</div>
 				<div class="identity-match-details" id="identity-match-nick-{{$id.uid}}">({{$id.nickname}})</div>
 			</div>