--- euca2ools-1.3.1/bin/euca-bundle-image.userdash	2011-02-17 18:49:23.470341988 -0800
+++ euca2ools-1.3.1/bin/euca-bundle-image	2011-02-17 18:51:30.422454861 -0800
@@ -142,7 +142,7 @@ def main():
         cert_path = euca.get_environ('EC2_CERT')
         private_key_path = euca.get_environ('EC2_PRIVATE_KEY')
         ec2cert_path = euca.get_environ('EUCALYPTUS_CERT')
-        user_string = euca.get_environ('EC2_USER_ID')
+        user = euca.get_environ('EC2_USER_ID')
     except NotFoundError:
         sys.exit(1)
 
@@ -152,8 +152,6 @@ def main():
     mapping = None
     product_codes = None
     product_code_string = None
-    if user_string:
-        user = user_string.replace('-', '')
 
     for (name, value) in euca.opts:
         if name in ('-h', '--help'):
@@ -165,7 +163,7 @@ def main():
         elif name in ('-k', '--privatekey'):
             private_key_path = value
         elif name in ('-u', '--user'):
-            user = value.replace('-', '')
+            user = value
         elif name == '--kernel':
             kernel = value
         elif name == '--ramdisk':
@@ -191,6 +189,7 @@ def main():
 
     if image_path and cert_path and private_key_path and user \
         and ec2cert_path:
+        user = user.replace('-', '')
         try:
             euca.validate_file(image_path)
         except FileValidationError:
--- euca2ools-1.3.1/bin/euca-bundle-vol.userdash	2011-02-17 18:58:26.652861184 -0800
+++ euca2ools-1.3.1/bin/euca-bundle-vol	2011-02-17 19:00:35.621856539 -0800
@@ -258,11 +258,6 @@ def main():
         elif name in ('-k', '--privatekey'):
             private_key_path = value
         elif name in ('-u', '--user'):
-            try:
-                user = value.replace('-', '')
-            except ValueError:
-                print 'Invalid user', value
-                sys.exit()
             user = value
         elif name == '--kernel':
             kernel = value
@@ -302,6 +297,7 @@ def main():
 
     if size_in_MB and cert_path and private_key_path and user \
         and ec2cert_path:
+        user = user.replace('-', '')
         try:
             euca.validate_file(cert_path)
         except FileValidationError: