diff --git a/config/master.sh b/config/master.sh
index 962726f..4c6a06f 100644
--- a/config/master.sh
+++ b/config/master.sh
@@ -1,9 +1,9 @@
 declare -A cfg
 
-cfg[ip]=127.0.0.1 # IP address to bind to - use 0.0.0.0 to bind to all
+cfg[ip]=0.0.0.0 # IP address to bind to - use 0.0.0.0 to bind to all
 
 cfg[http]=true # enables/disables listening on HTTP
-cfg[port]=1337 # HTTP port
+cfg[port]=1341 # HTTP port
 
 cfg[namespace]='app'
 
diff --git a/src/account.sh b/src/account.sh
index 96504a5..e57d875 100755
--- a/src/account.sh
+++ b/src/account.sh
@@ -74,7 +74,7 @@ function session_get_username() {
 	[[ "$1" == "" ]] && return
 
 	IFS=':'
-	local data=($(grep ":$1" secret/users.dat))
+	local data=($(grep ":$1$" secret/users.dat))
 	unset IFS
 	echo ${data[0]}
 }
diff --git a/src/server.sh b/src/server.sh
index be146ab..600ce47 100755
--- a/src/server.sh
+++ b/src/server.sh
@@ -54,9 +54,10 @@ while read param; do
 		r[authorization]="$(printf "$param" | sed 's/Authorization: Bearer //;s/\r//')"
 		
 	elif [[ "$param" == *"Cookie: "* ]]; then
-		for i in $(echo $param | sed -E 's/Cookie: //;s/\;//g;s/%/\\x/g'); do
-			name="$(echo $i | sed -E 's/\=(.*)$//')"
-			value="$(echo $i | sed -E 's/^(.*)\=//')"
+		IFS=';'
+		for i in $(IFS=' '; echo "$param" | sed -E 's/Cookie: //;;s/%/\\x/g'); do
+			name="$((grep -Poh ".*?(?==)" | head -1) <<< $i)"
+			value="$(sed "s/$name=//" <<< $i)"
 			cookies[$name]="$(echo -e $value)"
 		done