diff --git a/core/css/styles.css b/core/css/styles.css
index 646a760f9894f4338d7f1b6797804b7f6c1f3b8b..4de9cbd8fef4870fce0ae15c6154b694f7082997 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -79,7 +79,25 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
 #login form { width:22em; margin:2em auto 2em; padding:0; }
 #login form fieldset { background:0; border:0; margin-bottom:2em; padding:0; }
 #login form fieldset legend { font-weight:bold; }
+
+/* Nicely grouping input field sets */
+.grouptop input {
+	margin-bottom:0;
+	border-bottom:0; border-bottom-left-radius:0; border-bottom-right-radius:0;
+}
+.groupmiddle input {
+	margin-top:0; margin-bottom:0;
+	border-top:0; border-radius:0;
+	box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset;
+}
+.groupbottom input {
+	margin-top:0;
+	border-top:0; border-top-right-radius:0; border-top-left-radius:0;
+	box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset;
+}
+
 #login form label { margin:.95em 0 0 .85em; color:#666; }
+#login .groupmiddle label, #login .groupbottom label { margin-top:13px; }
 /* NEEDED FOR INFIELD LABELS */
 p.infield { position: relative; }
 label.infield { cursor: text !important; }
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 1e7983eae5351038544d4fb2a36b962753425252..79d30eff539402741efae2f8a7e8dda2d46b095e 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -34,11 +34,11 @@
 	<?php endif; ?>
 	<fieldset>
 		<legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend>
-		<p class="infield">
+		<p class="infield grouptop">
 			<label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label>
 			<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />
 		</p>
-		<p class="infield">
+		<p class="infield groupbottom">
 			<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
 			<input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" required />
 		</p>
@@ -101,15 +101,15 @@
 
 		<?php if($hasOtherDB): ?>
 		<div id="use_other_db">
-			<p class="infield">
+			<p class="infield grouptop">
 				<label for="dbuser" class="infield"><?php echo $l->t( 'Database user' ); ?></label>
 				<input type="text" name="dbuser" id="dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" autocomplete="off" />
 			</p>
-			<p class="infield">
+			<p class="infield groupmiddle">
 				<label for="dbpass" class="infield"><?php echo $l->t( 'Database password' ); ?></label>
 				<input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" />
 			</p>
-			<p class="infield">
+			<p class="infield groupmiddle">
 				<label for="dbname" class="infield"><?php echo $l->t( 'Database name' ); ?></label>
 				<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_]+" />
 			</p>
@@ -117,13 +117,13 @@
 		<?php endif; ?>
 		<?php if($_['hasOracle']): ?>
 		<div id="use_oracle_db">
-			<p class="infield">
+			<p class="infield groupmiddle">
 				<label for="dbtablespace" class="infield"><?php echo $l->t( 'Database tablespace' ); ?></label>
 				<input type="text" name="dbtablespace" id="dbtablespace" value="<?php print OC_Helper::init_var('dbtablespace'); ?>" autocomplete="off" />
 			</p>
 		</div>
 		<?php endif; ?>
-		<p class="infield">
+		<p class="infield groupbottom">
 			<label for="dbhost" class="infield"><?php echo $l->t( 'Database host' ); ?></label>
 			<input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" />
 		</p>
diff --git a/core/templates/login.php b/core/templates/login.php
index d6b09c83d3a6a8bfd40341b953ba2b74de885f13..cb4b6717b61ce17bd37685a70004b641ce8d56bd 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -16,11 +16,11 @@
 			</li></a>
 		<?php endif; ?>
 		</ul>
-		<p class="infield">
+		<p class="infield grouptop">
 			<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
 			<input type="text" name="user" id="user" value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus']?' autofocus':''; ?> autocomplete="on" required />
 		</p>
-		<p class="infield">
+		<p class="infield groupbottom">
 			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
 			<input type="password" name="password" id="password" value="" required<?php echo $_['user_autofocus']?'':' autofocus'; ?> />
 		</p>