Login Functionality +
mergefix