Switch secret_key stuff to username/pwd