Feature/fix admission links