diff --git a/README.md b/README.md
index f9c8a2e618598c98e4a5ac8229231c8e6f3a75b6..92fecb3c58ee43c41e48aa87d09189163b68e60e 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,8 @@ Optional args:
 |--dummyfrequency| |How often dummy messages should be sent per second. This flag is likely to be replaced when we implement better dummy message sending.|--dummyfrequency 0.5|
 |--end2end| |Send messages with E2E encryption to destination user|--end2end|
 |--keyParams| |Set E2E key generation parameters. Pass values in comma separated list, with the following order: MinKeys,MaxKeys,NumRekeys,TTLScalar,MinNumKeys|--keyParams 100,200,32,1.2,50|
+|--email|-E|Email to register for User Discovery (default "default@default.com")||
+|--nick| |Nickname to register for User Discovery (default "Default")||
 |--ndfPubKey|-p|Path to the public key for the network definition JSON file|
 |--ndf|-n|Path to the network definition JSON file|
 |--ndfVerifySignature| |Specifies if the NDF should be loaded without the signature|
diff --git a/cmd/root.go b/cmd/root.go
index 83771e292c0e004ed2c9e3ca6db1a1160fa7cc58..7f59a48dbe3136d7f12e1cd19f1ac07631cffa5c 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -49,6 +49,7 @@ var registrationCertPath string
 var registrationAddr string
 var registrationCode string
 var userEmail string
+var userNick string
 var end2end bool
 var keyParams []string
 var client *api.Client
@@ -506,9 +507,14 @@ func init() {
 
 	rootCmd.PersistentFlags().StringVarP(&userEmail,
 		"email", "E",
-		"",
+		"default@default.com",
 		"Email to register for User Discovery")
 
+	rootCmd.PersistentFlags().StringVar(&userNick,
+		"nick",
+		"Default",
+		"Nickname to register for User Discovery")
+
 	rootCmd.PersistentFlags().StringVarP(&sessionFile, "sessionfile", "f",
 		"", "Passes a file path for loading a session.  "+
 			"If the file doesn't exist the code will register the user and"+