Fix for password fields having a value

Both the fake placeholder and the actual input field would be visible, if the password field had a placeholder and a value.
Simplify if statements
Remove leftover curly brace
Merge pull request #34 from manavo/patch-1

Fix for password fields having a value