MoKeeHelper: Mutiluser fix

Change-Id: Iae3689ebd4042b25578553335a12a3052d33fbb5
MoKeeHelper: Code Cleanup

Change-Id: I518cd539951768df71da502ead4c089b7b486ab2