fixed User rules and cleaned up Profile