Arrange the fields in a table.
Add user without a secret
Polish
Optimize it for users without a secret