diff --git a/avandu.el b/avandu.el
index 1d441a6..a343c64 100644
--- a/avandu.el
+++ b/avandu.el
@@ -105,6 +105,11 @@
   :group 'avandu
   :type 'string)
 
+(defcustom avandu-user nil
+  "Username of your Tiny Tiny RSS account."
+  :group 'avandu
+  :type 'string)
+
 ;; Variables
 (defvar avandu--session-id nil
   "*internal* Session id for avandu.")
@@ -137,9 +142,6 @@
 (defvar avandu-password nil
   "Password for your Tiny Tiny RSS account.")
 
-(defvar avandu-user nil
-  "Username of your Tiny Tiny RSS account.")
-
 ;; Macros
 (defmacro avandu--next-button-of-type (direction type)
   "Go DIRECTION and find the next button of a TYPE."
diff --git a/doc/avandu.texinfo b/doc/avandu.texinfo
index bbaba15..ac920d2 100644
--- a/doc/avandu.texinfo
+++ b/doc/avandu.texinfo
@@ -77,21 +77,23 @@ Now that it is installed, it needs to be configured
 Avandu only has one option at this time.
 
 @defopt avandu-tt-rss-api-url
-This option tells avandu where to look for the api to your Tiny Tiny
-RSS instance. This needs to be the complete url to the api, for
-example @indicateurl{http://tt-rss.org/demo/api/}. Before this option
-is set avandu won't be able to do anything.
+This option should contain a string. It tells avandu where to look for
+the api to your Tiny Tiny RSS instance. This needs to be the complete
+url to the api, for example
+@indicateurl{http://tt-rss.org/demo/api/}. Before this option is set
+avandu won't be able to do anything.
+@end defopt
+
+@defopt avandu-user
+This option should contain a string. It is the username that is used
+to log in to your Tiny Tiny RSS instance.  If it is @code{nil} it will
+get asked for when avandu tries to connect, and once a succesful
+connection has been made it will remember it until you log out.
 @end defopt
 
 Other than this, it is possible, but unnecessary to set the following
 variables.
 
-@defvar avandu-user
-The username that is used to log in to your Tiny Tiny RSS instance.
-This will get asked for when avandu tries to connect, and once a
-succesful connection has been made it will remember it.
-@end defvar
-
 @defvar avandu-password
 The password to use to log in to your Tiny Tiny RSS instance.  This
 option shouldn't really be set, it is mostly used to remember the