Fixed my dropbox_oauth -- account-manager booboo
merged my booboos