Changed from stored passwords to environment variables