Completed Admin Normalization

Signed-off-by: Oz Ramos <labofoz+dev@gmail.com>