Fixed sign in issue, added fields to application controller.
fixes merge conflicts