Revert "Revert "Authenticate via password""

Even more of an idiot than I thought. Reverted the wrong change. GRRRR

This reverts commit 2fe412ce3a93f0df4651a177032cf88aab252e5f.

Change-Id: I9408ae19972bb24af26c0ec833c5d2cbba3e28f5
Merge "Revert "Revert "Authenticate via password"""