Added empty-field handling and helper method to AdminActivity.