diff --git a/src/app/registration/registration.component.html b/src/app/registration/registration.component.html
index 3e40db9..9e7cbde 100644
--- a/src/app/registration/registration.component.html
+++ b/src/app/registration/registration.component.html
@@ -2,6 +2,7 @@
   <mat-card class="register-card" [class.busy]="loading">
     <mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
     <mat-card-title>Registrierung</mat-card-title>
+    <mat-divider></mat-divider>
     <mat-card-content>
       <form [formGroup]="registerFormGroup" id="register-form" (ngSubmit)="onSubmit()">
         <p>
diff --git a/src/app/service/authentication.service.ts b/src/app/service/authentication.service.ts
index cbbce6f..64a6d81 100644
--- a/src/app/service/authentication.service.ts
+++ b/src/app/service/authentication.service.ts
@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@angular/core';
 import { TypedAxiosInstance } from 'restyped-axios';
 import { from, Observable, ReplaySubject } from 'rxjs';
-import { tap } from 'rxjs/operators';
+import { tap, switchMap, catchError } from 'rxjs/operators';
 import { SumzAPI } from '../api/api';
 import { HttpClient } from './http-client';
 
@@ -194,28 +194,27 @@ export class AuthenticationService {
       return response;
     },
       error => {
-        if (!!error.response
-          && error.response.status === 401
-          && localStorage.getItem('currentUser')
-          && !error.response.config.headers._isRetry) {
+        if (error.message === 'Network Error' ||
+          (!!error.response
+            && error.response.status === 401
+            && !error.response.config.headers._isRetry)
+          && localStorage.getItem('currentUser')) {
 
           // get new access_token
-          this.refresh()
-            .subscribe(
-              () => {
+          const newResponse = this.refresh()
+            .pipe(
+              switchMap(({ data }) => {
                 // update Authorization header in primary request
-                error.config.headers.Authorization = JSON.parse(localStorage.getItem('currentUser')).token_type
+                error.config.headers.Authorization = data.token_type
                   + ' '
-                  + JSON.parse(localStorage.getItem('currentUser')).access_token;
+                  + data.access_token;
                 error.config.headers._isRetry = true;
-                // return the response with a new access_token
+
+                // return the response using a new access_token
                 return this._apiClient.request(error.config);
-              },
-              () => {
-                console.log('Refresh login error: ', error);
-                return Promise.reject(error);
-              }
-            );
+              })
+            ).toPromise();
+          return newResponse;
         }
         return Promise.reject(error);
       });