diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 0f0beaf..c390f54 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
-import { OAuthModule } from 'angular-oauth2-oidc';
+import { OAuthModule, OAuthStorage } from 'angular-oauth2-oidc';
 import { HttpClientModule } from '@angular/common/http';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NgxMatDatetimePickerModule, NgxMatTimepickerModule } from '@angular-material-components/datetime-picker';
@@ -22,12 +22,16 @@ import { TravelFormComponent } from './views/travel-form/travel-form.component';
 import { NewTravelComponent } from './pages/new-travel/new-travel.component';
 import { MatDatepickerModule } from '@angular/material/datepicker';
 import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
-import { AppRoutingModule } from './app-routing.module';
+import { AppRouterModule } from './router.module';
+
+// We need a factory, since localStorage is not available during AOT build time.
+export function storageFactory(): OAuthStorage {
+  return localStorage;
+}
 
 @NgModule({
   imports: [
     BrowserModule,
-    AppRoutingModule,
     FormsModule,
     ReactiveFormsModule,
     HttpClientModule,
@@ -39,6 +43,7 @@ import { AppRoutingModule } from './app-routing.module';
       },
     }),
     BrowserAnimationsModule,
+    AppRouterModule,
     MaterialModule,
     MatDatepickerModule,
     NgxMatDatetimePickerModule,
@@ -55,6 +60,7 @@ import { AppRoutingModule } from './app-routing.module';
     NewTravelComponent
   ],
   providers: [
+    { provide: OAuthStorage, useFactory: storageFactory }
     // (useHash) ? { provide: LocationStrategy, useClass: HashLocationStrategy } : [],
     // {provide: AuthConfig, useValue: authConfig },
     // { provide: OAuthStorage, useValue: localStorage },
diff --git a/src/app/app-routing.module.ts b/src/app/router.module.ts
similarity index 96%
rename from src/app/app-routing.module.ts
rename to src/app/router.module.ts
index 90a3e6b..64f85fc 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/router.module.ts
@@ -37,4 +37,4 @@ const routes: Routes = [
   imports: [RouterModule.forRoot(routes)],
   exports: [RouterModule]
 })
-export class AppRoutingModule { }
+export class AppRouterModule { }