Tried to fix the server PASS bugs...

Hopefully this time it works...
Final fixes to make the PASS work... This time it actually works.