diff --git a/apps/nogui/nushell/jolheiser.nu b/apps/nogui/nushell/jolheiser.nu
index e6f3bfa588e6c4440114b313b1d7aaaf46c91451..104803b0a2a50c8e1b87e97bca1233ec090ec1a5 100644
--- a/apps/nogui/nushell/jolheiser.nu
+++ b/apps/nogui/nushell/jolheiser.nu
@@ -33,6 +33,7 @@   repo: string # Repo name
   --forge (-f) = "github": string@"forge types" # Forge type (github, gitea, jojodev, codeberg)
   --owner (-o): string # Owner (default: current dir name)
 ] {
+  let owner = ($env.PWD | path basename)
   mut id = 'gh'
   if $forge == 'gitea' {
     $id = 'gt'
@@ -41,18 +42,12 @@     $id = 'jj'
   } else if $forge == 'codeberg' {
     $id = 'cb'
   }
-  mut namespace = ($env.PWD | path basename)
-  if $owner != '' {
-    $namespace = $owner
-  }
   let origin = $'ssh:($id):jolheiser/($repo).git'
-  let upstream = $'($id):($namespace)/($repo).git'
+  let upstream = $'($id):($owner)/($repo).git'
   ^git clone $origin
   cd $repo
-  if $namespace != 'jolheiser' {
-    ^git remote add upstream $upstream
-    ^git fetch upstream
-  }
+  ^git remote add upstream $upstream
+  ^git fetch upstream
 }
 
 def fg [args ...string] {