Fix: urlencode defined twice and missing password salt