diff --git a/gnocchiclient/auth.py b/gnocchiclient/auth.py
index c3f6f40..5b7d81a 100644
--- a/gnocchiclient/auth.py
+++ b/gnocchiclient/auth.py
@@ -107,9 +107,11 @@ class GnocchiBasicLoader(loading.BaseLoader):
         options = super(GnocchiBasicLoader, self).get_options()
         options.extend([
             GnocchiOpt('user', help='User', required=True,
+                       default="admin",
                        metavar="<gnocchi user>"),
             GnocchiOpt('endpoint', help='Gnocchi endpoint',
                        dest="endpoint", required=True,
+                       default="http://localhost:8041",
                        metavar="<gnocchi endpoint>"),
         ])
         return options
diff --git a/gnocchiclient/shell.py b/gnocchiclient/shell.py
index 6557bce..0e0bd0f 100644
--- a/gnocchiclient/shell.py
+++ b/gnocchiclient/shell.py
@@ -132,7 +132,7 @@ class GnocchiShell(app.App):
             help='Defaults to env[GNOCCHI_API_VERSION] or 1.')
         loading.register_session_argparse_arguments(parser=parser)
         plugin = loading.register_auth_argparse_arguments(
-            parser=parser, argv=sys.argv, default="password")
+            parser=parser, argv=sys.argv, default="gnocchi-basic")
 
         if not isinstance(plugin, (auth.GnocchiNoAuthLoader,
                                    auth.GnocchiBasicLoader)):