diff --git a/web/lib/auth.js b/web/lib/auth.js
index 4f8e547..59e8db6 100644
--- a/web/lib/auth.js
+++ b/web/lib/auth.js
@@ -2,7 +2,7 @@ import crypto from 'crypto';
 import passwords from 'passwords';
 import uuid from 'node-uuid';
 import views from 'co-views';
-const render = views('views', { default: 'ejs'});
+const render = views(__dirname + '/../views', { default: 'ejs'});
 import debugname from 'debug';
 const debug = debugname('hostr-web:auth');
 import { Mandrill } from 'mandrill-api/mandrill';
@@ -131,9 +131,9 @@ export function* sendResetToken(ctx, email) {
       'token': token,
       'created': Math.round(new Date().getTime() / 1000)
     });
-    const html = yield this.render('email/inlined/forgot', {forgotUrl: this.locals.baseUrl + '/forgot/' + token});
+    const html = yield render('email/inlined/forgot', {forgotUrl: process.env.BASE_URL + '/forgot/' + token});
     const text = `It seems you've forgotten your password :(
-Visit  ${ctx.locals.baseUrl + '/forgot/' + token} to set a new one.
+Visit  ${process.env.BASE_URL + '/forgot/' + token} to set a new one.
 `;
     mandrill.messages.send({message: {
       html: html,
diff --git a/web/views/signup.ejs b/web/views/signup.ejs
index 826b678..16f327a 100644
--- a/web/views/signup.ejs
+++ b/web/views/signup.ejs
@@ -18,6 +18,11 @@
 
   <section class="container user-form clearfix">
       <p class="lead">Sign up to Hostr.</p>
+      <% if(typeof message !== 'undefined') { %>
+        <div class="alert alert-success alert-signin">
+          <%= message %>
+        </div>
+      <% } %>
       <div class="holder">
           <form role="form" action="/signup" method="post">
             <% if(typeof error !== 'undefined') { %>