-import { UserService } from '@app/shared'
-import { ScreenService } from '@app/shared/misc/screen.service'
+import { AuthService, Notifier, ScreenService, ServerService, UserService } from '@app/core'
+import {
+ USER_CHANNEL_NAME_VALIDATOR,
+ USER_EMAIL_VALIDATOR,
+ USER_PASSWORD_OPTIONAL_VALIDATOR,
+ USER_PASSWORD_VALIDATOR,
+ USER_ROLE_VALIDATOR,
+ USER_USERNAME_VALIDATOR,
+ USER_VIDEO_QUOTA_DAILY_VALIDATOR,
+ USER_VIDEO_QUOTA_VALIDATOR
+} from '@app/shared/form-validators/user-validators'
+import { FormValidatorService } from '@app/shared/shared-forms'
+import { UserCreate, UserRole } from '@shared/models'
+import { UserEdit } from './user-edit'