Modified: Setting login configuration
Modified: fix conflicts.