Remove username and password from options
Fix icon on error