various fixes for errors management and user to admin promotion
merged with button changes