Allow login modules to be more flexible
Merge pull request #875 from mposolda/master

Allow login modules to be more flexible