Fixes for auth controller