diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
index dc79a1a76a..a84ff7775b 100755
--- a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
+++ b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
@@ -88,7 +88,7 @@ set_shell()
 	fi
 	SHELL_PATH=$(grep /$USER_SHELL$ /etc/shells | tail -1)
 
-	chsh -s $(grep -iF "/$USER_SHELL" /etc/shells | tail -1)
+	chsh -s $(grep -wiF "/$USER_SHELL" /etc/shells | tail -1)
 	echo -e "\nShell: \x1B[92m${USER_SHELL^^}\x1B[0m"
 
 	# change shell for future users