Fix #476: Update wm login, disable persona
Merge pull request #496 from k88hudson/476

Fix #476: Update wm login, disable persona