Sign in and registration fix

Fixes implemented per your comments