#111 - Only set username and password if string is not empty