Fixes for login chapter