diff --git a/.install/scuttlebutt.sh b/.install/scuttlebutt.sh
index 7ea9f09..ebea782 100755
--- a/.install/scuttlebutt.sh
+++ b/.install/scuttlebutt.sh
@@ -14,29 +14,34 @@ scuttlebutt() {
 		source ~/.bashrc
 		nvm install --lts
 
-		# Install sbot-server
-		[[ ! -d ~/.ssb_astroport ]] && mkdir -p ~/.ssb_astroport && cd ~/.ssb_astroport
+		# Install ssb-server and config in ~/.ssb_astroport
+		[[ ! -d ~/.ssb_astroport ]] && mkdir -p ~/.ssb_astroport
+        cd ~/.ssb_astroport
+
 		npm install sodium-native ssb-backlinks ssb-ws ssb-links ssb-query 
 		npm install -g ssb-server
     fi
- 
-	# test Install
+    
+	# TEST ssb-server Install
     ssbSERVER=$(which ssb-server)
     [[ $ssbSERVER == "" ]] && echo "Check your ssb-server install... Cannot find it !!" && exit 1
-       
-   	# BACKUP OLD SSB
-	[[ ! -d ~/.ssb.$USER && -d ~/.ssb ]] && mv ~/.ssb ~/.ssb.$USER # BACKUP OLD SSB
+   	# If exists backup ~/.ssb to ~/.ssb_$USER SSB (one time only !)
+	[[ -d ~/.ssb ]] && [[ ! -d ~/.ssb_$USER ]] && mv ~/.ssb ~/.ssb_$USER
+    # CREATE ~/.ssb_astroport
+    [[ ! -d ~/.ssb_astroport ]] && mkdir -p ~/.ssb_astroport && cd ~/.ssb_astroport
+    # if exists, keep ~/.ssb_$USER/secret*
+    [[ ! -f ~/.ssb_astroport/secret ]] && [[ -f ~/.ssb_$USER/secret ]] && cp -f ~/.ssb_$USER/secret* ~/.ssb_astroport/
 
-	# MAKE A LINK ~/.ssb_astroport to ~/.ssb
-	[[ ! -d ~/.ssb_astroport ]] && mkdir ~/.ssb_astroport
-	[[ ! -L ~/.ssb ]] && ln -s ~/.ssb_astroport ~/.ssb
+	# Symlink ~/.ssb -> ~/.ssb_astroport
+ 	[[ -L ~/.ssb ]] && rm ~/.ssb
+    [[ -d ~/.ssb_astroport ]] && ln -s ~/.ssb_astroport ~/.ssb
 
 	# Create config (TODO: adapt if public Pub or Local Node)
 	nodename=$(cat /etc/hostname)
-	extension=$($(echo $nodename | cut -d '.' -f 2))
+	extension=$(echo $nodename | cut -d '.' -f 2)
 
 	if [[ $extension == "" ]]; then
-		nodename=$(echo $nodename).home
+		nodename=$nodename.home
 	
 		# LOCAL
 		cat > ~/.ssb/config <<EOF
@@ -79,21 +84,21 @@ EOF
 	
 	# Store current user as sudo will change it
 	currentUser=$USER
+    [[ -f /etc/systemd/system/ssb.service ]] && sudo rm -f /etc/systemd/system/ssb.service
+	# Copy SYSTEMD service to correct location
+	cp "$BASE_DIR/ssb.service" /tmp/ssb.service
+	# Copy repplace __USER__ place holder to current user
+	sed -i "s|__USER__|${currentUser}|g" /tmp/ssb.service
+	sed -i "s|__SSBSERVER__|ssb-server|g" /tmp/ssb.service
 
-	if [[ ! -f /etc/systemd/system/ssb.service ]]; then
-		# Copy SYSTEMD service to correct location
-		sudo cp "$BASE_DIR/ssb.service" /tmp/ssb.service
-		# Copy repplace __USER__ place holder to current user
-		sudo sed -i "s|__USER__|${currentUser}|g" /tmp/ssb.service
-		sudo sed -i "s|__SSBSERVER__|${ssbSERVER}|g" /tmp/ssb.service
+	sudo mv /tmp/ssb.service /etc/systemd/system/ssb.service
 
-		sudo mv /tmp/ssb.service /etc/systemd/system/ssb.service
-
-		# Reload, Enable and start SSB Service
-		sudo systemctl daemon-reload
-		sudo systemctl enable ssb.service
-		sudo systemctl start ssb.service
-	fi
+	# Reload, Enable and start SSB Service
+	sudo systemctl daemon-reload
+	sudo systemctl enable ssb.service
+	sudo systemctl restart ssb.service
+    
+    sudo systemctl status ssb.service
 
 }