diff --git a/cps/admin.py b/cps/admin.py
index ff34e8b8..84106221 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -2081,7 +2081,7 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
 
 
 def extract_user_data_from_field(user, field):
-    match = re.search(field + r"=([@\.\d\s\w-]+)", user, re.IGNORECASE | re.UNICODE)
+    match = re.search(field + r"=(.*?)($|(?<!\\),)", user, re.IGNORECASE | re.UNICODE)    
     if match:
         return match.group(1)
     else:
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index b163ecfe..0ece5817 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -289,14 +289,15 @@ class TaskConvert(CalibreTask):
                 command.extend(['--from-opf', path_tmp_opf])
             if has_cover:
                 command.extend(['--cover', os.path.join(os.path.dirname(file_path), 'cover.jpg')])
-            quotes_index = 3
+            # quotes_index = 3
             if config.config_calibre:
-                parameters = config.config_calibre.split(" ")
-                for param in parameters:
-                    command.append(param)
-                    quotes.append(quotes_index)
-                    quotes_index += 1
-
+                parameters = re.findall(r"--[\w-]+(?:(\s(?:(\".+\")|(?:.+?)|(?:(\'.+\'))))(?:\s|$))?",
+                                        config.config_calibre, re.IGNORECASE | re.UNICODE)
+                if parameters:
+                    for param in parameters:
+                        command.append(param)
+                        #quotes.append(quotes_index)
+                        #quotes_index += 1
             p = process_open(command, quotes, newlines=False)
         except OSError as e:
             return 1, N_("Ebook-converter failed: %(error)s", error=e)