Fix some problems regarding password variables
Merge branch 'master' of https://github.com/vnn/wifi