Added password checking to cli utilities (not yet in GUI)