diff --git a/plugins/Later/config.py b/plugins/Later/config.py
index fd1e96a92..eb505a8d6 100644
--- a/plugins/Later/config.py
+++ b/plugins/Later/config.py
@@ -48,5 +48,8 @@ conf.registerGlobalValue(Later, 'maximum',
 conf.registerGlobalValue(Later, 'private',
     registry.Boolean(True, _("""Determines whether users will be notified in
     the first place in which they're seen, or in private.""")))
+conf.registerGlobalValue(Later, 'tellOnJoin',
+    registry.Boolean(True, _("""Determines whether users will be notified upon
+    joining any channel the bot is in, or only upon sending a message.""")))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
diff --git a/plugins/Later/plugin.py b/plugins/Later/plugin.py
index 109cc65a1..79cb85a87 100644
--- a/plugins/Later/plugin.py
+++ b/plugins/Later/plugin.py
@@ -203,10 +203,11 @@ class Later(callbacks.Plugin):
     def _formatNote(self, when, whence, note):
         return _('Sent %s: <%s> %s') % (self._timestamp(when), whence, note)
 
-    doJoin = doPrivmsg
+    def doJoin(self, irc, msg):
+        if self.registryValue('tellOnJoin'):
+            self.doPrivmsg(irc, msg)
 Later = internationalizeDocstring(Later)
 
-
 Class = Later
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: