diff --git a/R/DSLoginBuilder.R b/R/DSLoginBuilder.R
index 10ea02c..55cd2d4 100644
--- a/R/DSLoginBuilder.R
+++ b/R/DSLoginBuilder.R
@@ -62,9 +62,9 @@ DSLoginBuilder <- R6::R6Class(
       } else if (startsWith(url,"http") && !startsWith(url,"https") && !private$.silent) {
         warning("Secure HTTP connection is recommended: ", url, call. = FALSE)
       }
-      if (private$.is.empty(table) && private$.is.empty(resource)) {
-        stop("The table and resource parameters cannot be both empty", call. = FALSE)
-      }
+      #if (private$.is.empty(table) && private$.is.empty(resource)) {
+      #  stop("The table and resource parameters cannot be both empty", call. = FALSE)
+      #}
 
       lg  <- private$.get.logins()
       if (ncol(lg) == 0) {
diff --git a/R/datashield.login.R b/R/datashield.login.R
index 2944f45..82e7522 100644
--- a/R/datashield.login.R
+++ b/R/datashield.login.R
@@ -41,7 +41,7 @@
 #' builder <- newDSLoginBuilder()
 #' builder$append(server="server1", url="https://opal-demo.obiba.org",
 #'                table="datashield.CNSIM1", resource="datashield.CNSIM1r",
-#'                user="administrator", password="password",
+#'                user="dsuser", password="password",
 #'                options="list(ssl_verifyhost=0,ssl_verifypeer=0)")
 #' builder$append(server="server2", url="dslite.server",
 #'                table="CNSIM2", resource="CNSIM2r", driver="DSLiteDriver")
@@ -63,6 +63,21 @@
 #' # Example 3: login and assign specific variable(s)
 #' myvar <- list("LAB_TSC")
 #' connections <- datashield.login(logins=logindata, assign=TRUE, variables=myvar)
+#'
+#' # note that the asignment information can also be provided afterwards
+#' builder <- newDSLoginBuilder()
+#' builder$append(server="server1", url="https://opal-demo.obiba.org",
+#'                user="dsuser", password="password")
+#' builder$append(server="server2", url="https://opal-test.obiba.org",
+#'                token="123456789")
+#' logindata <- builder$build()
+#' connections <- datashield.login(logins=logindata)
+#' datashield.assign.table(connections, symbol = "D",
+#'                         table = list(server1 = "CNSIM.CNSIM1",
+#'                                      server2 = "CNSIM.CNSIM2"))
+#' datashield.assign.resource(connections, symbol = "rsrc",
+#'                            table = list(server1 = "res.CNSIM1",
+#'                                         server2 = "res.CNSIM2"))
 #'}
 #'
 datashield.login <- function(logins=NULL, assign=FALSE, variables=NULL, missings=FALSE, symbol="D", id.name=NULL,
diff --git a/man/datashield.login.Rd b/man/datashield.login.Rd
index 5585b8f..1fe1a71 100644
--- a/man/datashield.login.Rd
+++ b/man/datashield.login.Rd
@@ -66,7 +66,7 @@ combined with a user name, depending on the data repository system).
 builder <- newDSLoginBuilder()
 builder$append(server="server1", url="https://opal-demo.obiba.org",
                table="datashield.CNSIM1", resource="datashield.CNSIM1r",
-               user="administrator", password="password",
+               user="dsuser", password="password",
                options="list(ssl_verifyhost=0,ssl_verifypeer=0)")
 builder$append(server="server2", url="dslite.server",
                table="CNSIM2", resource="CNSIM2r", driver="DSLiteDriver")
@@ -88,6 +88,21 @@ connections <- datashield.login(logins=logindata, assign=TRUE)
 # Example 3: login and assign specific variable(s)
 myvar <- list("LAB_TSC")
 connections <- datashield.login(logins=logindata, assign=TRUE, variables=myvar)
+
+# note that the asignment information can also be provided afterwards
+builder <- newDSLoginBuilder()
+builder$append(server="server1", url="https://opal-demo.obiba.org",
+               user="dsuser", password="password")
+builder$append(server="server2", url="https://opal-test.obiba.org",
+               token="123456789")
+logindata <- builder$build()
+connections <- datashield.login(logins=logindata)
+datashield.assign.table(connections, symbol = "D",
+                        table = list(server1 = "CNSIM.CNSIM1",
+                                     server2 = "CNSIM.CNSIM2"))
+datashield.assign.resource(connections, symbol = "rsrc",
+                           table = list(server1 = "res.CNSIM1",
+                                        server2 = "res.CNSIM2"))
 }
 
 }