uid/psw should be required fields

This pull address issue #611.