Systems API: Fixing register action

Need to discuss this change with @parthaa. Please do not merge/ack/review. Thanks.