Fix issues with #login