diff --git a/onionshare/__init__.py b/onionshare/__init__.py
index f0889263..7a1bf170 100644
--- a/onionshare/__init__.py
+++ b/onionshare/__init__.py
@@ -59,8 +59,8 @@ def main(cwd=None):
     parser.add_argument('--auto-stop-timer', metavar='<int>', dest='autostop_timer', default=0, help="Stop sharing after a given amount of seconds")
     parser.add_argument('--connect-timeout', metavar='<int>', dest='connect_timeout', default=120, help="Give up connecting to Tor after a given amount of seconds (default: 120)")
     parser.add_argument('--stealth', action='store_true', dest='stealth', help="Use client authorization (advanced)")
-    parser.add_argument('--receive', action='store_true', dest='receive', help="Receive files instead of sending them")
-    parser.add_argument('--website', action='store_true', dest='website', help="Host a static website as an onion service")
+    parser.add_argument('--receive', action='store_true', dest='receive', help="Receive shares instead of sending them")
+    parser.add_argument('--website', action='store_true', dest='website', help="Publish a static website")
     parser.add_argument('--config', metavar='config', default=False, help="Custom JSON config file location (optional)")
     parser.add_argument('-v', '--verbose', action='store_true', dest='verbose', help="Log OnionShare errors to stdout, and web errors to disk")
     parser.add_argument('filename', metavar='filename', nargs='*', help="List of files or folders to share")
diff --git a/onionshare_gui/mode/website_mode/__init__.py b/onionshare_gui/mode/website_mode/__init__.py
index ef7df94e..50af4725 100644
--- a/onionshare_gui/mode/website_mode/__init__.py
+++ b/onionshare_gui/mode/website_mode/__init__.py
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 import os
-import secrets
 import random
 import string
 
diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py
index c5e7dc24..bed86895 100644
--- a/onionshare_gui/onionshare_gui.py
+++ b/onionshare_gui/onionshare_gui.py
@@ -374,13 +374,16 @@ class OnionShareGui(QtWidgets.QMainWindow):
             if not self.common.settings.get('autostop_timer'):
                 self.share_mode.server_status.autostop_timer_container.hide()
                 self.receive_mode.server_status.autostop_timer_container.hide()
+                self.website_mode.server_status.autostop_timer_container.hide()
             # If we switched off the auto-start timer setting, ensure the widget is hidden.
             if not self.common.settings.get('autostart_timer'):
                 self.share_mode.server_status.autostart_timer_datetime = None
                 self.receive_mode.server_status.autostart_timer_datetime = None
+                self.website_mode.server_status.autostart_timer_datetime = None
                 self.share_mode.server_status.autostart_timer_container.hide()
                 self.receive_mode.server_status.autostart_timer_container.hide()
-
+                self.website_mode.server_status.autostart_timer_container.hide()
+                
         d = SettingsDialog(self.common, self.onion, self.qtapp, self.config, self.local_only)
         d.settings_saved.connect(reload_settings)
         d.exec_()