Add handling for site username and password
Remove trailing spaces