Adding some error cases for the admin promotion and some subtle UI tweaks