Enhanced return paths enforcements in admin controllers