added temp fix for set create, function should be moved into service and cloud so it can be admin checked