Fix breaking credentials feature