Merge branch 'ShvaykaD-develop/3.0' into develop/3.0

@@ -127,8 +127,9 @@ export class AuthService {
       {email}, defaultHttpOptions());
       {email}, defaultHttpOptions());
   }
   }
 
 
-  public activate(activateToken: string, password: string): Observable<LoginResponse> {
-    return this.http.post<LoginResponse>('/api/noauth/activate', {activateToken, password}, defaultHttpOptions()).pipe(
+  public activate(activateToken: string, password: string, sendActivationMail: boolean): Observable<LoginResponse> {
+    return this.http.post<LoginResponse>(`/api/noauth/activate?sendActivationMail=${sendActivationMail}`,
+      {activateToken, password}, defaultHttpOptions()).pipe(
       tap((loginResponse: LoginResponse) => {
       tap((loginResponse: LoginResponse) => {
           this.setUserFromJwtToken(loginResponse.token, loginResponse.refreshToken, true);
           this.setUserFromJwtToken(loginResponse.token, loginResponse.refreshToken, true);
         }
         }

@@ -68,7 +68,7 @@ export class CreatePasswordComponent extends PageComponent implements OnInit, On
     } else {
     } else {
       this.authService.activate(
       this.authService.activate(
         this.activateToken,
         this.activateToken,
-        this.createPassword.get('password').value).subscribe();
+        this.createPassword.get('password').value, true).subscribe();
     }
     }
   }
   }
 }
 }