--- class.tx_commerce_pi3.php.orig	2012-07-19 16:58:30.834740156 +0200
+++ class.tx_commerce_pi3.php	2012-07-19 16:58:28.138740091 +0200
@@ -1618,7 +1618,19 @@
 					} else {
 						$feuData['username'] = $this->MYSESSION['billing']['email'];
 					}
-					$feuData['password'] = substr(uniqid(rand()), 0, 6);
+                    
+                    $cleartextPassword = substr(uniqid(rand()), 0, 6);                    
+                    
+                    $saltedPassword = '';
+                    if (t3lib_extMgm::isLoaded('saltedpasswords') && tx_saltedpasswords_div::isUsageEnabled('FE')) {
+                        $objSalt = tx_saltedpasswords_salts_factory::getSaltingInstance(NULL);
+                        if (is_object($objSalt)) {
+                            $saltedPassword = $objSalt->getHashedPassword($feuData['password']);
+                        }
+                    }    
+                    
+                    $feuData['password'] = $saltedPassword != '' ? $saltedPassword : $cleartextPassword;
+                    
 					$feuData['email'] = $this->MYSESSION['billing']['email'];
 					$feuData['name'] = $this->MYSESSION['billing']['name'] . ' ' . $this->MYSESSION['billing']['surname'];
 					$feuData['first_name'] = $this->MYSESSION['billing']['name'];
@@ -1652,6 +1664,7 @@
 						}
 					}
 
+                    $feuData['password'] = $cleartextPassword; // save cleartext pw so we can send it via mail to the user
 					$this->userData = $feuData;
 				}
 			}
