Login changes
Merged
Minar changes in loginact