Havoc login improvements