1 files changed, 16 insertions, 6 deletions

diff --git a/client/src/app/signup/signup.component.ts b/client/src/app/signup/signup.component.ts
index 607d64893..3341d4e09 100644
--- a/client/src/app/signup/signup.component.ts
+++ b/client/src/app/signup/signup.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'
 import { NotificationsService } from 'angular2-notifications'
 import { UserCreate } from '../../../../shared'
 import { FormReactive, UserService, UserValidatorsService } from '../shared'
-import { RedirectService, ServerService } from '@app/core'
+import { AuthService, RedirectService, ServerService } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 
@@ -18,6 +18,7 @@ export class SignupComponent extends FormReactive implements OnInit {
 
   constructor (
     protected formValidatorService: FormValidatorService,
+    private authService: AuthService,
     private userValidatorsService: UserValidatorsService,
     private notificationsService: NotificationsService,
     private userService: UserService,
@@ -59,11 +60,20 @@ export class SignupComponent extends FormReactive implements OnInit {
           return
         }
 
-        this.notificationsService.success(
-          this.i18n('Success'),
-          this.i18n('Registration for {{username}} complete.', { username: userCreate.username })
-        )
-        this.redirectService.redirectToHomepage()
+        // Auto login
+        this.authService.login(userCreate.username, userCreate.password)
+            .subscribe(
+              () => {
+                this.notificationsService.success(
+                  this.i18n('Success'),
+                  this.i18n('You are now logged in as {{username}}!', { username: userCreate.username })
+                )
+
+                this.redirectService.redirectToHomepage()
+              },
+
+              err => this.error = err.message
+            )
       },
 
       err => this.error = err.message