diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 46afd2ae..c1c615b3 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -5,7 +5,7 @@
 		border-style: solid;
 		border-color: #ececec #c8c8c8 #c8c8c8 #ececec;
 		background-image: url('/gallery3/themes/admin_default/images/backg-buttonlink.png');
-		padding: .2em .3em .2em .3em;
+		padding: .2em .3em;
 		font-weight: bold;
 	}
 	.gButtonLink:hover {
@@ -23,7 +23,7 @@
 		position: relative;
 	}
 	.gUserAdminList li img {
-		width: 20px
+		width: 20px;
 		height: 20px;
 		cursor: move;
 	}
@@ -42,7 +42,7 @@
 	.gActions a {
 		margin-right: 40px;
 	}
-	.gUserEdit {
+	.gPanel {
 		display: none;
 	}
 </style>
@@ -73,16 +73,14 @@
 					</span>
 					
 					<span class="gActions">
-						<a href="#" onclick="$('gUserEdit-<?= $user->id ?>').slideDown('slow');"><?= t("edit") ?></a>
+						<a href="users/edit_form/<?= $user->id ?>" class="gPanelLink"><?= t("edit") ?></a>
 		        <!--<a href="users/edit_form/<?= $user->id ?>" class="gDialogLink"><?= t("edit") ?></a>-->
 		        <? if (!(user::active()->id == $user->id || user::guest()->id == $user->id)): ?>
 		        	<a href="users/delete_form/<?= $user->id ?>" class="gDialogLink"><?= t("delete") ?></a>
 		        <? endif ?>
 					</span>
-	      </li>
-				
-				<li id="gUserEdit-<?= $user->id ?>" class="gUserEdit">
-					<form>
+          
+					<form id="gUserEdit-<?= $user->id ?>" class="gPanel">
 						<fieldset>
 							<label>Username</label>
 							<input type="text" />
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index e59a5a0b..c7b9cde4 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -30,4 +30,22 @@ $(document).ready(function(){
       }
     }
   });
+
+  var panelLinks = $(".gPanelLink");
+  for (i=0; i<panelLinks.length; i++) {
+    $(panelLinks[i]).bind("click", {element: panelLinks[i]}, handlePanelEvent);
+  }
+
 });
+
+function handlePanelEvent(event) {
+  openPanel(event.data.element);
+  event.preventDefault();
+}
+
+function openPanel(element) {
+  var parent = $(element).parent().parent();
+  var panel = $(parent).children(".gPanel");
+  panel.slideDown("slow");
+  return false;
+}