diff --git a/client/.angular-cli.json b/client/.angular-cli.json
deleted file mode 100644
index 7a8e05c..0000000
--- a/client/.angular-cli.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-    "project": {
-        "name": "pod-noms.web"
-    },
-    "apps": [
-        {
-            "root": "src",
-            "outDir": "dist",
-            "assets": [
-                "assets",
-                "favicon.ico",
-                "firebase-messaging-sw.js",
-                "facebook-auth.html",
-                "manifest.json"
-            ],
-            "index": "index.html",
-            "main": "main.ts",
-            "polyfills": "polyfills.ts",
-            "test": "test.ts",
-            "tsconfig": "tsconfig.app.json",
-            "testTsconfig": "tsconfig.spec.json",
-            "prefix": "app",
-            "styles": [
-                "styles.css"
-            ],
-            "scripts": [
-                "../node_modules/jquery/dist/jquery.js",
-                "../node_modules/tether/dist/js/tether.js",
-                "../node_modules/popper.js/dist/umd/popper.min.js",
-                "../node_modules/bootstrap/dist/js/bootstrap.js",
-                "../node_modules/howler/dist/howler.js"
-            ],
-            "environmentSource": "environments/environment.ts",
-            "environments": {
-                "dev": "environments/environment.ts",
-                "prod": "environments/environment.prod.ts"
-            }
-        }
-    ],
-    "e2e": {
-        "protractor": {
-            "config": "./protractor.conf.js"
-        }
-    },
-    "lint": [
-        {
-            "project": "src/tsconfig.app.json"
-        },
-        {
-            "project": "src/tsconfig.spec.json"
-        },
-        {
-            "project": "e2e/tsconfig.e2e.json"
-        }
-    ],
-    "test": {
-        "karma": {
-            "config": "./karma.conf.js"
-        }
-    },
-    "defaults": {
-        "styleExt": "css",
-        "component": {}
-    }
-}
diff --git a/client/angular.json b/client/angular.json
new file mode 100644
index 0000000..480cb04
--- /dev/null
+++ b/client/angular.json
@@ -0,0 +1,128 @@
+{
+    "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+    "version": 1,
+    "newProjectRoot": "projects",
+    "projects": {
+        "podnoms-web": {
+            "root": "",
+            "sourceRoot": "src",
+            "projectType": "application",
+            "prefix": "app",
+            "schematics": {},
+            "architect": {
+                "build": {
+                    "builder": "@angular-devkit/build-angular:browser",
+                    "options": {
+                        "outputPath": "dist/podnoms-web",
+                        "index": "src/index.html",
+                        "main": "src/main.ts",
+                        "polyfills": "src/polyfills.ts",
+                        "tsConfig": "src/tsconfig.app.json",
+                        "assets": [
+                            "src/favicon.ico",
+                            "src/assets",
+                            "src/firebase-messaging-sw.js",
+                            "src/facebook-auth.html",
+                            "src/manifest.json"
+                        ],
+                        "styles": ["src/styles.css"],
+                        "scripts": [
+                            "node_modules/jquery/dist/jquery.js",
+                            "node_modules/tether/dist/js/tether.js",
+                            "node_modules/popper.js/dist/umd/popper.min.js",
+                            "node_modules/bootstrap/dist/js/bootstrap.js",
+                            "node_modules/howler/dist/howler.js"
+                        ]
+                    },
+                    "configurations": {
+                        "production": {
+                            "fileReplacements": [
+                                {
+                                    "replace":
+                                        "src/environments/environment.ts",
+                                    "with":
+                                        "src/environments/environment.prod.ts"
+                                }
+                            ],
+                            "optimization": true,
+                            "outputHashing": "all",
+                            "sourceMap": false,
+                            "extractCss": true,
+                            "namedChunks": false,
+                            "aot": true,
+                            "extractLicenses": true,
+                            "vendorChunk": false,
+                            "buildOptimizer": true
+                        }
+                    }
+                },
+                "serve": {
+                    "builder": "@angular-devkit/build-angular:dev-server",
+                    "options": {
+                        "browserTarget": "podnoms-web:build"
+                    },
+                    "configurations": {
+                        "production": {
+                            "browserTarget": "podnoms-web:build:production"
+                        }
+                    }
+                },
+                "extract-i18n": {
+                    "builder": "@angular-devkit/build-angular:extract-i18n",
+                    "options": {
+                        "browserTarget": "podnoms-web:build"
+                    }
+                },
+                "test": {
+                    "builder": "@angular-devkit/build-angular:karma",
+                    "options": {
+                        "main": "src/test.ts",
+                        "polyfills": "src/polyfills.ts",
+                        "tsConfig": "src/tsconfig.spec.json",
+                        "karmaConfig": "src/karma.conf.js",
+                        "styles": ["styles.css"],
+                        "scripts": [],
+                        "assets": [
+                            "src/favicon.ico",
+                            "src/assets",
+                            "firebase-messaging-sw.js",
+                            "facebook-auth.html",
+                            "manifest.json"
+                        ]
+                    }
+                },
+                "lint": {
+                    "builder": "@angular-devkit/build-angular:tslint",
+                    "options": {
+                        "tsConfig": [
+                            "src/tsconfig.app.json",
+                            "src/tsconfig.spec.json"
+                        ],
+                        "exclude": ["**/node_modules/**"]
+                    }
+                }
+            }
+        },
+        "podnoms-web-e2e": {
+            "root": "e2e/",
+            "projectType": "application",
+            "architect": {
+                "e2e": {
+                    "builder": "@angular-devkit/build-angular:protractor",
+                    "options": {
+                        "protractorConfig": "e2e/protractor.conf.js",
+                        "devServerTarget": "podnoms-web:serve"
+                    }
+                },
+                "lint": {
+                    "builder": "@angular-devkit/build-angular:tslint",
+                    "options": {
+                        "tsConfig": "e2e/tsconfig.e2e.json",
+                        "exclude": ["**/node_modules/**"]
+                    }
+                }
+            }
+        }
+    },
+    "defaultProject": "podnoms-web"
+}
diff --git a/client/package.json b/client/package.json
index 02657ae..19b976d 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,75 +1,77 @@
 {
-  "name": "pod-noms.web",
-  "version": "0.22.0",
-  "license": "MIT",
-  "scripts": {
-    "ng": "ng",
-    "start": "ng serve --aot",
-    "build": "ng build",
-    "test": "ng test",
-    "lint": "ng lint"
-  },
-  "ngrxGen": {
-    "basePath": "./src/app",
-    "seperateDirectory": true
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/animations": "^5.2.10",
-    "@angular/common": "^5.2.10",
-    "@angular/compiler": "^5.2.10",
-    "@angular/core": "^5.2.10",
-    "@angular/forms": "^5.2.10",
-    "@angular/http": "^5.2.10",
-    "@angular/platform-browser": "^5.2.10",
-    "@angular/platform-browser-dynamic": "^5.2.10",
-    "@angular/router": "^5.2.10",
-    "@aspnet/signalr": "1.0.0-rc1-30631",
-    "@ngrx/effects": "^5.1.0",
-    "@ngrx/store": "^5.1.0",
-    "@ngrx/store-devtools": "^5.1.0",
-    "@qontu/ngx-inline-editor": "^0.2.0-alpha.12",
-    "angular2-jwt": "^0.2.3",
-    "angular2-moment": "^1.8.0",
-    "angularfire2": "^5.0.0-rc.6",
-    "angularx-social-login": "^1.1.8",
-    "applicationinsights-js": "^1.0.15",
-    "bootstrap": "4.1.0",
-    "core-js": "^2.5.3",
-    "dropzone": "^5.3.0",
-    "firebase": "4.12.1",
-    "howler": "^2.0.9",
-    "jquery": "^3.3.1",
-    "lodash": "^4.17.5",
-    "ng2-toasty": "^4.0.3",
-    "ngx-bootstrap": "^2.0.4",
-    "ngx-clipboard": "^10.0.0",
-    "ngx-moment": "^2.0.0-rc.0",
-    "popper.js": "^1.13.0",
-    "rxjs": "5.5.6",
-    "tether": "^1.4.3",
-    "uglify-es": "^3.3.10",
-    "zone.js": "^0.8.20"
-  },
-  "devDependencies": {
-    "@angular/cli": "1.7.4",
-    "@angular/compiler-cli": "^5.2.6",
-    "@angular/language-service": "^5.2.6",
-    "@types/applicationinsights-js": "^1.0.5",
-    "@types/jasmine": "^2.8.6",
-    "@types/node": "~9.4.6",
-    "codelyzer": "^4.2.1",
-    "jasmine-core": "~2.99.1",
-    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~2.0.0",
-    "karma-chrome-launcher": "~2.2.0",
-    "karma-cli": "~1.0.1",
-    "karma-coverage-istanbul-reporter": "^1.4.1",
-    "karma-jasmine": "^1.1.1",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.3.0",
-    "ts-node": "^5.0.1",
-    "tslint": "~5.9.1",
-    "typescript": "~2.5.3"
-  }
+    "name": "pod-noms.web",
+    "version": "0.22.0",
+    "license": "MIT",
+    "scripts": {
+        "ng": "ng",
+        "start": "ng serve --aot",
+        "build": "ng build",
+        "test": "ng test",
+        "lint": "ng lint"
+    },
+    "ngrxGen": {
+        "basePath": "./src/app",
+        "seperateDirectory": true
+    },
+    "private": true,
+    "dependencies": {
+        "@angular/animations": "6.0.0",
+        "@angular/common": "6.0.0",
+        "@angular/compiler": "6.0.0",
+        "@angular/core": "6.0.0",
+        "@angular/forms": "6.0.0",
+        "@angular/http": "6.0.0",
+        "@angular/platform-browser": "6.0.0",
+        "@angular/platform-browser-dynamic": "6.0.0",
+        "@angular/router": "6.0.0",
+        "@angular-devkit/build-angular": "~0.6.0",
+        "@aspnet/signalr": "1.0.0-rc1-30631",
+        "@ngrx/effects": "6.0.0-beta.1",
+        "@ngrx/store": "6.0.0-beta.1",
+        "@ngrx/store-devtools": "6.0.0-beta.1",
+        "@qontu/ngx-inline-editor": "^0.2.0-alpha.12",
+        "angular2-jwt": "^0.2.3",
+        "angular2-moment": "^1.8.0",
+        "angularfire2": "^5.0.0-rc.6",
+        "angularx-social-login": "^1.1.8",
+        "applicationinsights-js": "^1.0.15",
+        "bootstrap": "4.1.0",
+        "core-js": "^2.5.3",
+        "dropzone": "^5.3.0",
+        "firebase": "4.12.1",
+        "howler": "^2.0.9",
+        "jquery": "^3.3.1",
+        "lodash": "^4.17.5",
+        "ng2-toasty": "^4.0.3",
+        "ngx-bootstrap": "^2.0.4",
+        "ngx-clipboard": "^10.0.0",
+        "ngx-moment": "^2.0.0-rc.0",
+        "popper.js": "^1.13.0",
+        "rxjs": "^6.1.0",
+        "rxjs-compat": "^6.1.0",
+        "tether": "^1.4.3",
+        "uglify-es": "^3.3.10",
+        "zone.js": "^0.8.26"
+    },
+    "devDependencies": {
+        "@angular/cli": "6.0.0",
+        "@angular/compiler-cli": "6.0.0",
+        "@angular/language-service": "6.0.0",
+        "@types/applicationinsights-js": "^1.0.5",
+        "@types/jasmine": "^2.8.6",
+        "@types/node": "~9.4.6",
+        "codelyzer": "^4.2.1",
+        "jasmine-core": "~2.99.1",
+        "jasmine-spec-reporter": "~4.2.1",
+        "karma": "~2.0.0",
+        "karma-chrome-launcher": "~2.2.0",
+        "karma-cli": "~1.0.1",
+        "karma-coverage-istanbul-reporter": "^1.4.1",
+        "karma-jasmine": "^1.1.1",
+        "karma-jasmine-html-reporter": "^0.2.2",
+        "protractor": "~5.3.0",
+        "ts-node": "^5.0.1",
+        "tslint": "~5.9.1",
+        "typescript": "2.7.2"
+    }
 }
diff --git a/client/src/app/services/podnoms-auth.service.ts b/client/src/app/services/podnoms-auth.service.ts
index 80abcfd..6fe5255 100644
--- a/client/src/app/services/podnoms-auth.service.ts
+++ b/client/src/app/services/podnoms-auth.service.ts
@@ -116,7 +116,6 @@ export class PodnomsAuthService extends BaseService {
                 body,
                 this.httpOptions
             )
-            .map((res) => true)
             .catch(this.handleError);
     }
     public logout() {