diff --git a/client/src/Home.js b/client/src/Home.js
index ec29c1b7..51ffd281 100644
--- a/client/src/Home.js
+++ b/client/src/Home.js
@@ -20,7 +20,7 @@ export default class List extends Component {
         return (
             <div>
                 <h2>{t('Mailtrain 2 beta')}</h2>
-                <div>{t('Build') + ' 2019-07-29-0947'}</div>
+                <div>{t('Build') + ' 2019-07-29-0959'}</div>
             </div>
         );
     }
diff --git a/client/src/lib/namespace.js b/client/src/lib/namespace.js
index 2c8aeef7..55b4a569 100644
--- a/client/src/lib/namespace.js
+++ b/client/src/lib/namespace.js
@@ -32,16 +32,20 @@ export function getDefaultNamespace(permissions) {
 }
 
 export function namespaceCheckPermissions(createOperation) {
-    return {
-        createEntityInUsersNamespace: {
-            entityTypeId: 'namespace',
-            entityId: mailtrainConfig.user.namespace,
-            requiredOperations: [createOperation]
-        },
-        viewUsersNamespace: {
-            entityTypeId: 'namespace',
-            entityId: mailtrainConfig.user.namespace,
-            requiredOperations: ['view']
-        }
-    };
+    if (mailtrainConfig.user) {
+        return {
+            createEntityInUsersNamespace: {
+                entityTypeId: 'namespace',
+                entityId: mailtrainConfig.user.namespace,
+                requiredOperations: [createOperation]
+            },
+            viewUsersNamespace: {
+                entityTypeId: 'namespace',
+                entityId: mailtrainConfig.user.namespace,
+                requiredOperations: ['view']
+            }
+        };
+    } else {
+        return {};
+    }
 }