Trying to fix bad credentials stuff