Login block minor refactoring