Added links to change password
Made long text only appear in the correct situations