Thanks Vinod.
actually, i am planning to wait for a few days as we are going live on 18th. If the issue seems to be big, then I will proceed with these changes.
also, the function Context.GetCurrentIdentityUUID() which you mentioned gives the UUID. Is there any other one which gives the user id? Because finding UUID of the system would be very hard and to be hardcoded. (which is a very bad idea).