Logic Change for Admin Bug Fix