One time login being displayed as [user:one-time-login-url] in email to user

I had previously worked around this by using php in the email at admin/commerce/config/email like so:

<?php
$resetUrl =  user_pass_reset_url($account); 
?>
<p><a href="<?php print $resetUrl;?>"><?php print $resetUrl;?></a></p>

However this stopped working for some reason so my new workaround is this:

Edit the rule supplied by commerce_email here: /admin/config/workflow/rules/reaction/manage/commerce_email_new_account
In the loop at the end, add a new action (system:send email)
for To: use [user:mail]
for message just copy what is in admin/commerce/config/email for the account email.
delete the "send variable email" from the loop.
edit the account email in admin/commerce/config/email to say something like DUE TO A BUG THIS EMAIL IS NOT USED. and say how to find the rule that needs editing.

NOTE: you need to check that rules can resolve the one-time-login token. check in the tokens list in the email action to see that its there. If its not, you probably have to put this patch into rules:
http://drupal.org/files/1289898-rules-restricted-user-tokens.patch
which is super easy to do by hand.

I'm not sure if that's necessary. I just haven't tested without it.

Same problem, nobody working on this issue?

Pretty big issue because it is destroying the anonymous users

Just want to confirm that the steps in #3 worked for me, too.

Seems to be an issue with Variable Email: #1430694: [user:one-time-login-url] is not available on config page, so new user cannot log in

Edit: now with correct issue link

See #1430694: [user:one-time-login-url] is not available on config page, so new user cannot log in. Note that the fix in that issue requires uncommenting a couple of lines.

My workaround has been:

/**
 * Implements hook_mail_alter()
 * 
 * Altering the email created by commerce_email_account in order to fix
 * http://drupal.org/node/1289898 
 * https://www.drupal.org/node/1864350
 * the one time login token is not rendered.
 */
function mymodule_commerce_mail_alter(&$message){
  if(isset($message['key'])){
    if($message['key'] == "commerce_email_account"){
      if(isset($message['body'][0]) && isset($message['to'])){
        //the account has been created through a rule.
        $account = user_load_by_mail($message['to']);
        if(!is_object($account)){
          return;
        }
        $login_link = user_pass_reset_url($account);
        $message['body'][0] = str_replace("[user:one-time-login-url]", $login_link, $message['body'][0]);
      }
    }
  }
}

I think solution should be on Token module, where the token is declared:

diff --git a/sites/all/modules/token/token.tokens.inc b/sites/all/modules/token/token.tokens.inc
index e0c0b5e..979dfbc 100644
--- a/sites/all/modules/token/token.tokens.inc
+++ b/sites/all/modules/token/token.tokens.inc
@@ -571,6 +571,9 @@
           $roles = array_intersect_key(user_roles(), $account->roles);
           $replacements[$original] = token_render_array($roles, $options);
           break;
+        case 'one-time-login-url':
+          $replacements[$original] = user_pass_reset_url($account);
+          break;
       }
     }

This is not the only token not replaced, so Tokens module should be reviewed to add those replacements.

#10 solved this problem for me.

I've created a patch based on #10, as this also solves my problem.
Bear with me, my first patch in the community. So I'm not sure what to do next ;)