fix choice fields / return
enable admin