Fixed merging errors with Admin UI