diff --git a/jsc_custom/handler/share_handler.py b/jsc_custom/handler/share_handler.py
index 17a600eb315d2d23531503c3022e7180ede4b128..f8a0b5047dd98dd72a611c3235ab2d87132de3d6 100644
--- a/jsc_custom/handler/share_handler.py
+++ b/jsc_custom/handler/share_handler.py
@@ -139,13 +139,15 @@ class R2DHandler(SpawnHandler):
 
         args_unquote = [urllib.parse.unquote(x) for x in args]
         user_options["repo2docker"]["repotype"] = repotype
+        user_options["repo2docker"]["repourl"] = "/".join(args_unquote)
 
         if len(arguments_dict_lower.get("name", [])) > 0:
             user_options["name"] = arguments_dict_lower.get("name")[0].decode("utf-8")
         else:
-            user_options["name"] = "Unnamed"
-
-        user_options["repo2docker"]["repourl"] = "/".join(args_unquote)
+            if repotype == "gh":
+                user_options["name"] = args_unquote[0]
+            else:
+                user_options["name"] = user_options["repo2docker"]["repourl"]
 
         # if "labpath" in self.request.arguments
         if len(arguments_dict_lower.get("labpath", [])) > 0: