Moved redeeming token immediately after validation

This will help to reduce the synchronization