Some more fixes to get passwords, need to find a way of compiling regex for passwords