Altered regex, fixing password handling. closes #47