Fixed #2 Password caching issue