code cleaning
correct errors with useraccounts plugin
merge