diff --git a/views/html/introduction/index.tpl b/views/html/introduction/index.tpl
index ef919187..3dc754ae 100644
--- a/views/html/introduction/index.tpl
+++ b/views/html/introduction/index.tpl
@@ -3,14 +3,14 @@
 
 <?php if(is_null($userId)) : ?>
 <h2><?=_('Login')?></h2>
-<form method="post" action="<?=$linker->link(array('users','login'))?>">
+<form method="post" action="<?=$linker->link(array('users','login'))?>" class="logreg">
 	<fieldset>
 		<label for="username"><?=_('Username')?>:</label>
 		<input name="username" type="text" placeholder="<?=_('Username')?>" title="<?=_('Username')?>" required="required" /><br />
 		<label for="password"><?=_('Password')?>:</label>
 		<input name="password" type="password" placeholder="<?=_('Password')?>" title="<?=_('Password')?>" required="required" /><br />
 	</fieldset>
-	<input type="submit" name="login" value="<?=_('Login')?>" />
+	<input type="submit" name="login" class="cta" value="<?=_('Login')?>" />
 	<?=_('or')?> <a href="<?=$linker->link(array('users','register'))?>"><?=_('register yourself')?></a>
 </form>
 <?php endif ?>
diff --git a/views/html/users/login.tpl b/views/html/users/login.tpl
index 932b4c20..f141f4cd 100644
--- a/views/html/users/login.tpl
+++ b/views/html/users/login.tpl
@@ -4,7 +4,7 @@
 <?php if($failed) : ?>
 <p class="invalid"><?=_('Login failed')?>.</p>
 <?php endif ?>
-<form method="post" action="<?=$linker->link(array(), 2)?>">
+<form method="post" action="<?=$linker->link(array(), 2)?>" class="logreg">
 	<fieldset>
 		<label for="username"><?=_('Username')?>:</label>
 		<input name="username" type="text" placeholder="<?=_('Username')?>" value="<?=$username?>" required="required" /><br />
diff --git a/views/html/users/register.tpl b/views/html/users/register.tpl
index 20cbfc63..29843569 100644
--- a/views/html/users/register.tpl
+++ b/views/html/users/register.tpl
@@ -73,7 +73,7 @@
 	<?php endforeach ?>
 </ul>
 <?php endif ?>
-<form method="post" action="<?=$linker->link(array(), 2)?>">
+<form method="post" action="<?=$linker->link(array(), 2)?>" class="logreg">
 	<fieldset>
 		<label for="username"><?=_('Username')?>:</label>
 		<input name="username" type="text" placeholder="<?=_('Username')?>" title="<?=_('Username')?>" required="required" maxlength="<?=$validationSettings['username']['maxlength']?>" value="<?=$username?>" <?=(array_key_exists('username', $validation)) ? 'class="invalid"' : null?> /><br />
diff --git a/www/css/desktop.css b/www/css/desktop.css
index e114e547..a882b22f 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -29,7 +29,7 @@ sup{top:-.5em}
 sub{bottom:-.25em}
 svg:not(:root){overflow:hidden}
 figure{margin:0}
-fieldset{border:.0625em solid #c0c0c0;margin:0 .125em;padding:.35em .625em .75em}
+fieldset{border:0;margin:0;padding:0}
 legend{border:0;padding:0}
 button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
 button,input{line-height:normal}
@@ -126,6 +126,14 @@ aside{display:none}
 input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;border-color:#d48c4e}
 
 
+/** Login & Registration **/
+
+.logreg{width:auto;display:inline-block;padding:15px 20px;background:#eae8e4;border-radius:3px}
+.logreg label{display:block;font-size:.875em}
+.logreg input{margin:5px 0 15px}
+.logreg .cta{display:block}
+
+
 /** Character Profile **/
 
 .cportrait img{width:100%}