Implementing one time password handling

* Now handling one time passwords correctly