Added possibility to disable devices management for ordinary users
Fixed NPE when removing device