Bringing logic more into line with active admin.