Added default login for non-production enviornments
Cleanup on default login