3 files changed, 10 insertions, 6 deletions

diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 00c0f699f..6655f8310 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -44,7 +44,7 @@ export default class Recipe {
     }
 
     if (!data.id) {
-      // Franz 4 recipes do not have an Id
+      // Ferdi 4 recipes do not have an Id
       throw Error(`Recipe '${data.name}' requires Id`);
     }
 
diff --git a/src/models/Service.js b/src/models/Service.js
index 023103048..3ab6e2603 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -2,7 +2,7 @@ import { computed, observable, autorun } from 'mobx';
 import path from 'path';
 import normalizeUrl from 'normalize-url';
 
-const debug = require('debug')('Franz:Service');
+const debug = require('debug')('Ferdi:Service');
 
 export const RESTRICTION_TYPES = {
   SERVICE_LIMIT: 0,
@@ -180,11 +180,15 @@ export default class Service {
   }
 
   @computed get userAgent() {
-    let userAgent = window.navigator.userAgent;
+    let { userAgent } = window.navigator;
     if (typeof this.recipe.overrideUserAgent === 'function') {
       userAgent = this.recipe.overrideUserAgent();
     }
 
+    // Remove Ferdi as it can cause incompatabilities with services.
+    // This way, Ferdi will look like a normal Chrome instance
+    userAgent = userAgent.replace(/(Ferdi|Electron)([^\s]+\s)/g, '');
+
     return userAgent;
   }
 
diff --git a/src/models/User.js b/src/models/User.js
index 0a2b1f62a..5a614efbe 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -20,11 +20,11 @@ export default class User {
 
   @observable isSubscriptionOwner = false;
 
-  @observable hasSubscription = false;
+  @observable hasSubscription = true;
 
   @observable hadSubscription = false;
 
-  @observable isPremium = false;
+  @observable isPremium = true;
 
   @observable beta = false;
 
@@ -50,7 +50,7 @@ export default class User {
     this.lastname = data.lastname || this.lastname;
     this.organization = data.organization || this.organization;
     this.accountType = data.accountType || this.accountType;
-    this.isPremium = data.isPremium || this.isPremium;
+    this.isPremium = true;
     this.beta = data.beta || this.beta;
     this.donor = data.donor || this.donor;
     this.isDonor = data.isDonor || this.isDonor;