Better credentials
(cherry picked from commit 71a1de7)