3 files changed, 21 insertions, 14 deletions
diff --git a/views/users/new.html b/views/users/new.html
index fc9c5a21..bf8b3b7d 100644
--- a/views/users/new.html
+++ b/views/users/new.html
@@ -6,14 +6,20 @@
 
 <form id="register" action="/users" method="post">
   {{#error}}
-  <div class="alert alert-danger">{{error}}</div>
+    <div class="alert alert-danger">{{error}}</div>
   {{/error}}
+
   <div class="form-group">
     <label for="username">Username:</label>
     <input type="text" id="username" name="username" class="form-control" />
   </div>
 
   <div class="form-group">
+    <label for="email">Email:</label>
+    <input type="text" id="email" name="email" class="form-control" />
+  </div>
+
+  <div class="form-group">
     <label for="password">Password:</label>
     <input type="password" id="password" name="password" class="form-control" />
   </div>
@@ -23,9 +29,5 @@
     <input type="password" id="confirm" name="confirm" class="form-control" />
   </div>
 
-  <div class="form-group">
-    <label for="email">Email:</label>
-    <input type="text" id="email" name="email" class="form-control" />
-  </div>
   <input class="btn btn-primary" type="submit" value="Register" />
 </form>
diff --git a/views/users/show.html b/views/users/show.html
index e852f16a..2db57008 100644
--- a/views/users/show.html
+++ b/views/users/show.html
@@ -2,18 +2,16 @@
   {{#js}}js/calculator{{/js}}
 {{/yield-scripts}}
 
+{{#verified}}
+<p class="alert alert-success alert-dismissible">
+<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+Your email has been verified. Thank you!
+</p>
+{{/verified}}
+
 <div id="calculator" style="display: none">
   <input id="user" type="hidden" value="{{user}}" />
 
-  <div id="bip32_notice" class="panel panel-warning" style="display: none">
-    <div class="panel-heading">
-      <h3 class="panel-title">September 1, 2014</h3>
-    </div>
-    <div class="panel-body">
-      We recently switched to using Bitcoin extended keys rather than single addresses to receive payments.  Your account does not yet have an extended key associated with it.  Please visit the <a href="/{{user}}/edit">Settings</a> page to create one now.
-    </div>
-  </div>
-
   <h1 id="title"></h1>
   <a href="/{{user}}/edit"><img id="logo" src="/assets/img/bitcoin.png" alt="Logo" /></a>
 
diff --git a/views/users/welcome.html b/views/users/welcome.html
new file mode 100644
index 00000000..ad7cfac1
--- /dev/null
+++ b/views/users/welcome.html
@@ -0,0 +1,7 @@
+<div id="main-logo"></div>
+
+<h1>Welcome to CoinOS</h1>
+
+<p>Thanks for signing up!  Please verify your email by clicking this link:<p>
+
+<div class="well"><a href="{{url}}">{{url}}</a></div>