Issue 818

- Fixed issues from previous PR
- Added post login information gathering for username, pin, password after openid login
- Updated with latest commits