Fixed database and separated admin actions