Fix for issue #2695

And inconsistencies.

Tested with this in confirm-order.php:
```
<?php echo shopp('customer.get-company','mode=value'); ?><br/>
<?php echo shopp('customer.get-email','mode=value'); ?><br/>
<?php echo shopp('customer.get-firstname','mode=value'); ?><br/>
<?php echo shopp('customer.get-lastname','mode=value'); ?><br/>
<?php echo shopp('customer.get-loginname','mode=value'); ?><br/>
<?php echo shopp('customer.get-marketing','mode=value'); ?><br/>
<?php echo shopp('customer.get-password','mode=value'); ?><br/>
<?php echo shopp('customer.get-phone','mode=value'); ?><br/>
```
Everything except get-loginname and get-password gives correct output.