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/global.css b/view/global.css
index 477f778d9a..e1ccd8b920 100644
--- a/view/global.css
+++ b/view/global.css
@@ -252,6 +252,7 @@ a {
   background: none;
   height: 80px;
   width: 80px;
+  cursor: pointer;
 }
 
 .selected-identity img {
diff --git a/view/templates/manage.tpl b/view/templates/manage.tpl
index 8a7922d7be..e23c402754 100644
--- a/view/templates/manage.tpl
+++ b/view/templates/manage.tpl
@@ -3,7 +3,7 @@
 <div id="identity-manage-desc">{{$desc}}</div>
 <div id="identity-manage-choose">{{$choose}}</div>
 
-<div id="identity-selector-wrapper">
+<div id="identity-selector-wrapper" role="menu">
 	<form action="manage" method="post" >
 
 	{{foreach $identities as $id}}
@@ -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>
 
@@ -25,7 +27,7 @@
 		</div>
 	{{/foreach}}
 
+	<div class="identity-match-break"></div>
+
 	</form>
 </div>
-	
-	
\ No newline at end of file