Fixed issue: Fix loginform consistent and cleanup