diff --git a/app/controllers/AuthController.php b/app/controllers/AuthController.php
index 8537e12..51fe187 100644
--- a/app/controllers/AuthController.php
+++ b/app/controllers/AuthController.php
@@ -81,17 +81,21 @@ class AuthController extends ControllerBase
                 else {
                     $result = $this->auth->loginOauth($data);
 
-                    // There was an error when creating the account
-                    if (is_array($result)) {
-                        $msg = '';
-                        foreach ($result as $message) {
-                            $msg .= '<li>' . $message->getMessage() . '</li>';
+                    if ($result === false) {
+
+                        if (User::findFirstByUsernameOrEmail($data->getEmail())) {
+                            $this->flash->error('The email address is already in use.');
+                            $this->response->redirect('/login');
+                            return;
                         }
-                        $this->flash->message('error', "Failed to create account: <ul>{$msg}</ul>");
-                        $this->response->redirect('/login');
-                    } else {
-                        $this->response->redirect('/');
+
+                        $this->session->set('auth:register:data', $data);
+                        $this->response->redirect(['for' => 'user-register']);
+                        return;
                     }
+
+                    // User is logged in.
+                    $this->response->redirect('/');
                 }
             } catch(\Exception $e) {
                 $this->flash->message('error', 'Failed to authenticate.');