diff --git a/core/templates/installation.php b/core/templates/installation.php
index b592cd6533d..c3bbe692c1c 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -24,7 +24,7 @@
 
 		<fieldset>
 			<legend><?php echo $l->t( 'Create an <strong>admin account</strong>.' ); ?></legend>
-			<p><label for="adminlogin"><?php echo $l->t( 'Username' ); ?></label><input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_HELPER::init_var('adminlogin'); ?>" /></p>
+			<p><label for="adminlogin"><?php echo $l->t( 'Username' ); ?></label><input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_HELPER::init_var('adminlogin'); ?>" autofocus /></p>
 			<p><label for="adminpass"><?php echo $l->t( 'Password' ); ?></label><input type="password" name="adminpass" id="adminpass" value="<?php print OC_HELPER::init_var('adminpass'); ?>" /></p>
         </fieldset>
         
diff --git a/core/templates/login.php b/core/templates/login.php
index e0f6ce23e2e..0ed4178a984 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -5,7 +5,7 @@
 			<?php if($_['error']): ?>
 				<?php echo $l->t( 'Login failed!' ); ?>
 			<?php endif; ?>
-			<input type="text" name="user" id="user" value="" />
+			<input type="text" name="user" id="user" value="" autofocus />
 			<input type="password" name="password" id="password" value="" />
 			<input type="submit" value="Log in" />
 		</fieldset>