WIP 13793 Initial fix
WIP 13793 Skips superuser on update
WIP 13793 sql syntax fix