diff --git a/resources/twig/auth/reset.twig b/resources/twig/auth/reset.twig
new file mode 100644
index 0000000000..b4a64a9ac7
--- /dev/null
+++ b/resources/twig/auth/reset.twig
@@ -0,0 +1,53 @@
+{% extends "./layout/guest.twig" %}
+
+{% block content %}
+
+    {% if errors|length > 0 %}
+        <div class="alert alert-danger">
+            <strong>Whoops!</strong> There were some problems with your input.<br><br>
+            <ul>
+                {% for error in errors.all %}
+                    <li>{{ error }}</li>
+                {% endfor %}
+            </ul>
+        </div>
+    {% endif %}
+
+
+
+    <div class="register-box-body">
+        <p class="login-box-msg">Reset your password</p>
+
+        <form method="POST" action="/password/reset">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}">
+            <input type="hidden" name="token" value="{{ token }}">
+
+            <div class="form-group has-feedback">
+                <input type="email" name="email" class="form-control" value="{{ old('email') }}" placeholder="Email"/>
+            </div>
+
+            <div class="form-group has-feedback">
+                <input type="password" class="form-control" placeholder="Password" name="password"/>
+            </div>
+
+            <div class="form-group has-feedback">
+                <input type="password" class="form-control" placeholder="Password (again)" name="password_confirmation"/>
+            </div>
+
+
+            <div class="row">
+                <div class="col-xs-12">
+                    <button type="submit" class="btn btn-primary pull-right btn-flat">Reset Password</button>
+                </div>
+                <!-- /.col -->
+            </div>
+
+        </form>
+
+        <a href="{{ URL.to('/auth/login') }}">I want to login</a><br>
+        {% if Config.get('auth.allow_register') %}
+            <a href="{{ route('register') }}" class="text-center">Register a new account</a><br>
+        {% endif %}
+    </div><!-- /.form-box -->
+
+{% endblock %}
diff --git a/resources/twig/emails/password.twig b/resources/twig/emails/password.twig
index 2aba25c1fc..5424f36fa8 100644
--- a/resources/twig/emails/password.twig
+++ b/resources/twig/emails/password.twig
@@ -1 +1 @@
-Click here to reset your password: {{ url('password/reset/' . token) }}
+Click here to reset your password: {{ url('password/reset/' ~ token) }}
\ No newline at end of file