diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs
index d873d21c7f..102863ea3d 100644
--- a/Assistant/Alert.hs
+++ b/Assistant/Alert.hs
@@ -34,6 +34,7 @@ data AlertName
 	| SanityCheckFixAlert
 	| WarningAlert String
 	| PairAlert String
+	| XMPPNeededAlert
 	deriving (Eq)
 
 {- The first alert is the new alert, the second is an old alert.
@@ -322,6 +323,21 @@ pairRequestAcknowledgedAlert repo button = baseActivityAlert
 	, alertButton = button
 	}
 
+xmppNeededAlert :: AlertButton -> Alert
+xmppNeededAlert button = Alert
+	{ alertHeader = Just "Keep your repositories in sync across the cloud, or share with friends."
+	, alertIcon = Just TheCloud
+	, alertPriority = High
+	, alertButton = Just button
+	, alertClosable = True
+	, alertClass = Message
+	, alertMessageRender = tenseWords
+	, alertBlockDisplay = True
+	, alertName = Just $ XMPPNeededAlert
+	, alertCombiner = Just $ dataCombiner $ \_old new -> new
+	, alertData = []
+	}
+
 fileAlert :: TenseChunk -> FilePath -> Alert
 fileAlert msg file = (activityAlert Nothing [f])
 	{ alertName = Just $ FileAlert msg
diff --git a/Assistant/WebApp/Configurators/Edit.hs b/Assistant/WebApp/Configurators/Edit.hs
index bb48737623..64d89c911e 100644
--- a/Assistant/WebApp/Configurators/Edit.hs
+++ b/Assistant/WebApp/Configurators/Edit.hs
@@ -16,6 +16,7 @@ import Assistant.WebApp.SideBar
 import Assistant.WebApp.Utility
 import Assistant.DaemonStatus
 import Assistant.MakeRemote (uniqueRemoteName)
+import Assistant.WebApp.Configurators.XMPP (xmppNeeded)
 import Utility.Yesod
 import qualified Remote
 import qualified Remote.List as Remote
@@ -100,6 +101,9 @@ getEditRepositoryR = editForm False
 getEditNewRepositoryR :: UUID -> Handler RepHtml
 getEditNewRepositoryR = editForm True
 
+getEditNewCloudRepositoryR :: UUID -> Handler RepHtml
+getEditNewCloudRepositoryR uuid = xmppNeeded >> editForm True uuid
+
 editForm :: Bool -> UUID -> Handler RepHtml
 editForm new uuid = bootstrap (Just Config) $ do
 	sideBarDisplay
diff --git a/Assistant/WebApp/Configurators/S3.hs b/Assistant/WebApp/Configurators/S3.hs
index cd019be0b8..e4401d445f 100644
--- a/Assistant/WebApp/Configurators/S3.hs
+++ b/Assistant/WebApp/Configurators/S3.hs
@@ -125,4 +125,4 @@ makeS3Remote (S3Creds ak sk) name setup config = do
 		return remotename
 	setup r
 	liftIO $ syncNewRemote st (daemonStatus webapp) (scanRemotes webapp) r
-	redirect $ EditNewRepositoryR $ Remote.uuid r
+	redirect $ EditNewCloudRepositoryR $ Remote.uuid r
diff --git a/Assistant/WebApp/Configurators/Ssh.hs b/Assistant/WebApp/Configurators/Ssh.hs
index 9c97a017f5..9da291b0c6 100644
--- a/Assistant/WebApp/Configurators/Ssh.hs
+++ b/Assistant/WebApp/Configurators/Ssh.hs
@@ -290,7 +290,7 @@ makeSshRepo forcersync setup sshdata = do
 		(scanRemotes webapp)
 		forcersync sshdata
 	setup r
-	redirect $ EditNewRepositoryR $ Remote.uuid r
+	redirect $ EditNewCloudRepositoryR $ Remote.uuid r
 
 getAddRsyncNetR :: Handler RepHtml
 getAddRsyncNetR = do
diff --git a/Assistant/WebApp/Configurators/XMPP.hs b/Assistant/WebApp/Configurators/XMPP.hs
index 830bea8aeb..80472c1d75 100644
--- a/Assistant/WebApp/Configurators/XMPP.hs
+++ b/Assistant/WebApp/Configurators/XMPP.hs
@@ -13,6 +13,8 @@ module Assistant.WebApp.Configurators.XMPP where
 import Assistant.WebApp
 import Assistant.WebApp.Types
 import Assistant.WebApp.SideBar
+import Assistant.Alert
+import Assistant.DaemonStatus
 import Utility.Yesod
 #ifdef WITH_XMPP
 import Assistant.Common
@@ -29,6 +31,17 @@ import Data.Text (Text)
 import qualified Data.Text as T
 #endif
 
+{- Displays an alert suggesting to configure XMPP, with a button. -}
+xmppNeeded :: Handler ()
+xmppNeeded = whenM (isNothing <$> runAnnex Nothing getXMPPCreds) $ do
+	dstatus <- daemonStatus <$> getYesod
+	urlrender <- getUrlRender
+	void $ liftIO $ addAlert dstatus $ xmppNeededAlert $ AlertButton
+		{ buttonLabel = "Configure a Jabber account"
+		, buttonUrl = urlrender XMPPR
+		, buttonAction = Just $ removeAlert dstatus
+		}
+
 getXMPPR :: Handler RepHtml
 #ifdef WITH_XMPP
 getXMPPR = xmppPage $ do
diff --git a/Assistant/WebApp/routes b/Assistant/WebApp/routes
index b9885f9e5c..2e848f44ef 100644
--- a/Assistant/WebApp/routes
+++ b/Assistant/WebApp/routes
@@ -13,6 +13,7 @@
 /config/repository/switchto/#FilePath SwitchToRepositoryR GET
 /config/repository/edit/#UUID EditRepositoryR GET
 /config/repository/edit/new/#UUID EditNewRepositoryR GET
+/config/repository/edit/new/cloud/#UUID EditNewCloudRepositoryR GET
 /config/repository/sync/disable/#UUID DisableSyncR GET
 /config/repository/sync/enable/#UUID EnableSyncR GET
 
diff --git a/doc/assistant/xmppnudge.png b/doc/assistant/xmppnudge.png
new file mode 100644
index 0000000000..b3a0658cbf
Binary files /dev/null and b/doc/assistant/xmppnudge.png differ