Refactoring of LoginActivities almost done