ACF-54: Bug fixed in token generation