diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index d79cc2c56e..84c4740265 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -4,6 +4,9 @@ use FireflyIII\Http\Controllers\Controller;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Auth\Registrar;
 use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
+use Illuminate\Http\Request;
+use Mail;
+use Session;
 
 /**
  * Class AuthController
@@ -43,4 +46,40 @@ class AuthController extends Controller
         $this->middleware('guest', ['except' => 'getLogout']);
     }
 
+    /**
+     * Handle a registration request for the application.
+     *
+     * @param  Request $request
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function postRegister(Request $request)
+    {
+        $validator = $this->registrar->validator($request->all());
+
+        if ($validator->fails()) {
+            $this->throwValidationException(
+                $request, $validator
+            );
+        }
+
+        $this->auth->login($this->registrar->create($request->all()));
+
+        // get the email address
+        $email = $this->auth->user()->email;
+
+        // send email.
+        Mail::send(
+            'emails.registered', [], function ($message) use ($email) {
+            $message->to($email, $email)->subject('Welcome to Firefly III!');
+        }
+        );
+
+        // set flash message
+        Session::flash('success','You have registered successfully!');
+
+
+        return redirect($this->redirectPath());
+    }
+
 }
diff --git a/resources/views/emails/registered.blade.php b/resources/views/emails/registered.blade.php
new file mode 100644
index 0000000000..5a58f60f2d
--- /dev/null
+++ b/resources/views/emails/registered.blade.php
@@ -0,0 +1,5 @@
+Hey there!
+
+Welkome to Firefly III. Your registration has made it, and this email is here to confirm it.
+
+Thanks for using Firefly!
\ No newline at end of file