diff --git a/app/src/components/OnBoard.vue b/app/src/components/OnBoard.vue
index 082c6a178d6e67527ff3d50719d443c02813fa27..8ecd9e127a8eea10b5407fd295707d16fbf0e013 100644
--- a/app/src/components/OnBoard.vue
+++ b/app/src/components/OnBoard.vue
@@ -203,9 +203,13 @@ export default {
       lower = spaces.split(' ').join('')
       result = lower.split('-').join('')
 
-      this.$store.dispatch('createMicrocosm', result)
-      localStorage.setItem('mylastMicrocosm', result)
-      this.microcosm = true
+      if (this.clientid != '') {
+        this.$store.dispatch('createMicrocosm', result)
+        localStorage.setItem('mylastMicrocosm', result)
+        this.microcosm = true
+      } else {
+        // console.log('name not set')
+      }
     },
     setClient() {
       var result
@@ -233,7 +237,11 @@ export default {
     },
 
     letsGo() {
-      this.$emit('client-added')
+      if (this.clientid != '') {
+        this.$emit('client-added')
+      } else {
+        //console.log('name not set ')
+      }
     },
 
     focusInput() {