diff --git a/src/pieces/app.py b/src/pieces/app.py
index 7a0aa7d..47ff446 100644
--- a/src/pieces/app.py
+++ b/src/pieces/app.py
@@ -137,6 +137,9 @@ def run(self):
             print_help()
             return
 
+        if not Settings.pieces_client.application.onboarded:
+            return onboarding_command()
+
         # Check if the command needs Pieces OS or not
         if arg not in ['help',"-v","--version","onboarding","install", "feedback", "contribute"]:
             Settings.startup()
diff --git a/src/pieces/commands/onboarding.py b/src/pieces/commands/onboarding.py
index 257ca62..4ae696f 100644
--- a/src/pieces/commands/onboarding.py
+++ b/src/pieces/commands/onboarding.py
@@ -19,7 +19,7 @@ def get_prompt():
     os_type = platform.system()
 
     if os_type == "Windows":
-        prompt = f"{path}"
+        prompt = f"{path}> "
     elif os_type == "Linux":
         prompt = f"{path}$ "
     else:
@@ -188,5 +188,6 @@ def onboarding_command(**kwargs):
     console.print("Thank you for using Pieces CLI!")
     console.print("You are now 10x more productive developer with Pieces")
     console.print("For more information visit https://docs.pieces.app/extensions-plugins/cli")
+    Settings.pieces_client.connector_api.onboarded(Settings.pieces_client.application.id, True)