BS3 update for system login
Merge pull request #779 from sexnothing/develop

BS3 update for system login