2 files changed, 5 insertions, 8 deletions
diff --git a/views/default/core/account/login_box.php b/views/default/core/account/login_box.php
index 40b5f5637..274172bdb 100644
--- a/views/default/core/account/login_box.php
+++ b/views/default/core/account/login_box.php
@@ -20,7 +20,7 @@ echo elgg_view_module('aside', $title, $body);
 
 
 <script type="text/javascript">
-	elgg.register_event_handler('init', 'system', function() { 
+	elgg.register_hook_handler('init', 'system', function() {
 		$('input[name=username]').focus(); 
 	});
 </script>
diff --git a/views/default/core/account/login_dropdown.php b/views/default/core/account/login_dropdown.php
index f3f105be1..a1d64a768 100644
--- a/views/default/core/account/login_dropdown.php
+++ b/views/default/core/account/login_dropdown.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Elgg drop-down login form
- *
- * @todo Forms 1.8: Convert to use elgg_view_form()
  */
 
 if (elgg_is_logged_in()) {
@@ -19,12 +17,11 @@ $body = elgg_view_form('login', array('action' => "{$login_url}action/login"), a
 <div id="login-dropdown">
 	<?php 
 		echo elgg_view('output/url', array(
-			'href' => 'login',
+			'href' => 'login#login-dropdown-box',
+			'rel' => 'popup',
+			'class' => 'elgg-button elgg-button-dropdown',
 			'text' => elgg_echo('login'),
 		)); 
 		echo elgg_view_module('dropdown', '', $body, array('id' => 'login-dropdown-box')); 
 	?>
-</div>
-<script>
-	$('#login-dropdown > a').attr('href', '#login-dropdown-box').addClass('elgg-toggler elgg-button elgg-button-dropdown');
-</script>
-\ No newline at end of file
+</div>
+\ No newline at end of file