diff --git a/app/assets/stylesheets/hyrax/_forms.scss b/app/assets/stylesheets/hyrax/_forms.scss
index ee5307c2c4..1000b3f4b5 100644
--- a/app/assets/stylesheets/hyrax/_forms.scss
+++ b/app/assets/stylesheets/hyrax/_forms.scss
@@ -29,8 +29,6 @@ legend small {
   padding-left:1.2em;
 }
 
-.form-group { margin-bottom: 2em; }
-
 .form-group.has-error input,
 .form-group.has-error option,
 .form-group.has-error textarea {
diff --git a/app/assets/stylesheets/hyrax/_header.scss b/app/assets/stylesheets/hyrax/_header.scss
index d1e6222986..a6410798f4 100644
--- a/app/assets/stylesheets/hyrax/_header.scss
+++ b/app/assets/stylesheets/hyrax/_header.scss
@@ -26,7 +26,7 @@ header > .navbar {
 }
 
 .dropdown-toggle:focus {
-  outline: 2px auto  Highlight; // FireFox
+  outline: 2px auto Highlight; // FireFox
   outline: 5px auto -webkit-focus-ring-color; // Chrome, Safari
   outline: -2px;
 }
diff --git a/app/assets/stylesheets/hyrax/_hyrax.scss b/app/assets/stylesheets/hyrax/_hyrax.scss
index 45534cf2c5..7aa2116bea 100644
--- a/app/assets/stylesheets/hyrax/_hyrax.scss
+++ b/app/assets/stylesheets/hyrax/_hyrax.scss
@@ -1,15 +1,15 @@
 @import 'hydra-editor/multi_value_fields';
 @import 'hyrax/variables', 'hyrax/file_sets', 'hyrax/settings', 'hyrax/header',
-        'hyrax/styles', 'hyrax/file-listing', 'hyrax/browse_everything_overrides',
-        'hyrax/nestable', 'hyrax/collections', 'hyrax/collection_types', 'hyrax/batch-edit',
-        'hyrax/home-page', 'hyrax/featured', 'hyrax/usage-stats', 'hyrax/catalog',
-        'hyrax/buttons', 'hyrax/tinymce', 'hyrax/proxy-rights', 'hyrax/file-show',
-        'hyrax/work-show', 'hyrax/modal', 'hyrax/forms', 'hyrax/form',
-        'hyrax/file_manager', 'hyrax/form-progress', 'hyrax/positioning',
-        'hyrax/fixedsticky', 'hyrax/file_upload', 'hyrax/representative-media',
-        'hyrax/footer', 'hyrax/select_work_type', 'hyrax/users', 'hyrax/dashboard',
-        'hyrax/sidebar', 'hyrax/controlled_vocabulary', 'hyrax/accessibility',
-        'hyrax/recent', 'hyrax/viewer', 'hyrax/breadcrumbs';
+  'hyrax/styles', 'hyrax/file-listing', 'hyrax/browse_everything_overrides',
+  'hyrax/nestable', 'hyrax/collections', 'hyrax/collection_types',
+  'hyrax/batch-edit', 'hyrax/home-page', 'hyrax/featured', 'hyrax/usage-stats',
+  'hyrax/catalog', 'hyrax/buttons', 'hyrax/tinymce', 'hyrax/proxy-rights',
+  'hyrax/file-show', 'hyrax/work-show', 'hyrax/modal', 'hyrax/forms',
+  'hyrax/form', 'hyrax/file_manager', 'hyrax/form-progress', 'hyrax/positioning',
+  'hyrax/fixedsticky', 'hyrax/file_upload', 'hyrax/representative-media',
+  'hyrax/footer', 'hyrax/select_work_type', 'hyrax/users', 'hyrax/dashboard',
+  'hyrax/sidebar', 'hyrax/controlled_vocabulary', 'hyrax/accessibility',
+  'hyrax/recent', 'hyrax/viewer', 'hyrax/breadcrumbs';
 @import 'typeahead';
 @import 'sharing_buttons';
 
diff --git a/app/assets/stylesheets/hyrax/_login_signup.scss b/app/assets/stylesheets/hyrax/_login_signup.scss
new file mode 100644
index 0000000000..e55019d2e1
--- /dev/null
+++ b/app/assets/stylesheets/hyrax/_login_signup.scss
@@ -0,0 +1,20 @@
+// Login / Sign up styles needed because Devise gem controls the markup
+form.new_user {
+  margin-bottom: 1rem;
+
+  .field {
+    @extend .form-group;
+
+    input[type='email'],
+    input[type='input'],
+    input[type='password'] {
+      @extend .form-control;
+      width: 300px;
+    }
+  }
+
+  input[type='submit'] {
+    @extend .btn;
+    @extend .btn-primary;
+  }
+}
diff --git a/lib/generators/hyrax/templates/hyrax.scss b/lib/generators/hyrax/templates/hyrax.scss
index 7770348e36..a43b967551 100644
--- a/lib/generators/hyrax/templates/hyrax.scss
+++ b/lib/generators/hyrax/templates/hyrax.scss
@@ -14,3 +14,4 @@
 @import "blacklight_gallery/slideshow";
 @import "blacklight_gallery/osd_viewer";
 @import 'hyrax/hyrax';
+@import 'hyrax/login_signup';