Moved user identification to separate blocks for consistency and removed version bump