diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
index 72a242f6..da1d0737 100644
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -34,7 +34,7 @@ body {
   padding: 1em 0;
 }
 
-.login-form {
+.login-form, .signup-form {
   @include make-xs-column(12);
   @include make-sm-column(8);
   @include make-sm-column-offset(2)
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 98b018eb..a4ff035d 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,31 +1,42 @@
-<div title="<%= t('users.account_signup') %>" id="signupform" class="form">
-<%= form_tag :action=> "create" do %>
+<div class="container-fluid">
+  <div class="row">
+    <div class="login-flash">
+      <%= bootstrap_flash :close_button => false %>
+    </div>
+  </div>
+  <div class="login-wrapper">
+    <div class="login-box">
+      <div class="icon-box">
+        <div class="tracks-icon"><div class="tracks-icon-text">10</div>
+      </div>
+      <div title="<%= t('users.account_signup') %>" id="signupform" class="signup-form" class="form">
+        <%= form_tag :action=> "create" do %>
 
-  <%= get_list_of_error_messages_for @user %><br/>
+          <%= get_list_of_error_messages_for @user %><br/>
 
-  <%= render_flash %>
+          <%= render_flash %>
 
-  <h3><%= @heading -%></h3>
+          <h3><%= @heading -%></h3>
 
-  <table>
-    <tr>
-      <td><label for="user_login"><%= t('users.desired_login') %>:</label></td>
-      <td> <%= text_field "user", "login", :size => 20 %></td>
-    </tr>
-    <tr>
-      <td><label for="user_password"><%= t('users.choose_password') %>:</label></td>
-      <td><%= password_field "user", "password", :size => 20 %></td>
-    </tr>
-    <tr>
-      <td><label for="user_password_confirmation"><%= t('users.confirm_password') %>:</label></td>
-      <td><%= password_field "user", "password_confirmation", :size => 20 %></td>
-    </tr>
-    <tr>
-      <td></td>
-      <td><input type="submit" id="signup" value="<%= t('users.signup') %> &#187;" class="primary" /></td>
-    </tr>
-  </table>
-<%end-%>
+          <div class="label-element-combo">
+            <%= label_tag "user_login", t('users.desired_login') %>
+            <%= text_field_tag "user_login", nil, class: "form-control" %>
+          </div>
+          <div class="label-element-combo">
+            <%= label_tag "user_password", t('users.choose_password') %>
+            <%= password_field_tag "user_password", nil, class: "form-control" %>
+          </div>
+          <div class="label-element-combo">
+            <%= label_tag "user_password_confirmation", t('users.confirm_password') %>
+            <%= password_field_tag "user_password_confirmation", nil, class: "form-control" %>
+          </div>
+          <%= submit_tag t("users.signup"), class: "btn btn-default" %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+  <div class="footer">
+    <%= render :partial => "shared/footer" %>
+  </div>
 </div>
 
-