diff --git a/pushmsg.cpp b/pushmsg.cpp
index 8dcdbb2..a976fc3 100644
--- a/pushmsg.cpp
+++ b/pushmsg.cpp
@@ -34,9 +34,9 @@ void read_options(int argc, char *argv[])
         ("help,h", "Display this help and exit.")
         ("baseurl", po::value<std::string>()->required(),
          "Example: https://push.example.org")
-        ("token", po::value<std::string>()->required(), "Application token")
-        ("title", po::value<std::string>()->required(), "Title of the message")
-        ("message", po::value<std::string>(), "Body of the message")
+        ("token", po::value<std::string>()->required(), "Application token.")
+        ("title", po::value<std::string>(), "Title of the message.")
+        ("message", po::value<std::string>()->required(), "Message body.")
         ("priority", po::value<std::int16_t>(),
          "Priority of the message. Default is 5. "
          "0 = no notification, 1-3 = silent, 4-7 = sound, 8-10 = popup.");
@@ -58,11 +58,12 @@ void read_options(int argc, char *argv[])
 
     message.base_url = vm["baseurl"].as<std::string>();
     message.token = vm["token"].as<std::string>();
-    message.title = vm["title"].as<std::string>();
-    if (vm.count("message") != 0)
+    if (vm.count("title") != 0)
+
     {
-        message.body = vm["message"].as<std::string>();
+        message.title = vm["title"].as<std::string>();
     }
+    message.body = vm["message"].as<std::string>();
     if (vm.count("priority") != 0)
     {
         message.priority = vm["priority"].as<std::int16_t>();