diff --git a/config.mcraft-only.json b/config.mcraft-only.json
index 51b6eee6..7d9a7b59 100644
--- a/config.mcraft-only.json
+++ b/config.mcraft-only.json
@@ -1,3 +1,4 @@
 {
-  "alwaysReconnectButton": true
+  "alwaysReconnectButton": true,
+  "reportBugButtonWithReconnect": true
 }
diff --git a/src/appConfig.ts b/src/appConfig.ts
index b8c1e219..ae9851b6 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -56,6 +56,7 @@ export type AppConfig = {
   defaultUsername?: string
   skinTexturesProxy?: string
   alwaysReconnectButton?: boolean
+  reportBugButtonWithReconnect?: boolean
 }
 
 export const loadAppConfig = (appConfig: AppConfig) => {
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 4bdd2974..12748b54 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -32,7 +32,7 @@ import Screen from './Screen'
 import styles from './PauseScreen.module.css'
 import { DiscordButton } from './DiscordButton'
 import { showNotification } from './NotificationProvider'
-import { appStatusState, reconnectReload } from './AppStatusProvider'
+import { appStatusState, lastConnectOptions, reconnectReload } from './AppStatusProvider'
 import NetworkStatus from './NetworkStatus'
 import PauseLinkButtons from './PauseLinkButtons'
 import { pixelartIcons } from './PixelartIcon'
@@ -265,7 +265,7 @@ export default () => {
     <div className={styles.pause_container}>
       <Button className="button" style={{ width: '204px' }} onClick={onReturnPress}>Back to Game</Button>
       <PauseLinkButtons />
-      <Button className="button" style={{ width: '204px' }} onClick={() => openOptionsMenu('main')}>Options</Button>
+      <Button className="button" style={{ width: '204px' }} onClick={() => openOptionsMenu('main')}>Options...</Button>
       {singleplayer ? (
         <div className={styles.row}>
           <Button className="button" style={{ width: '170px' }} onClick={async () => clickJoinLinkButton()}>
@@ -294,10 +294,54 @@ export default () => {
           {fsState.inMemorySave && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}
         </Button>
       </>}
-      {(noConnection || appConfig?.alwaysReconnectButton) && (
-        <Button className="button" style={{ width: '204px' }} onClick={reconnectReload}>
-          Reconnect
-        </Button>
+      {(true) && (
+        <div className={styles.row}>
+          <Button className="button" style={{ width: '98px' }} onClick={reconnectReload}>
+            Reconnect
+          </Button>
+          {true && (
+            <Button
+              label="Report Problem"
+              className="button"
+              style={{ width: '98px' }}
+              onClick={async () => {
+                const platform = (navigator as any).userAgentData?.platform ?? navigator.platform
+                const body = `Version: ${window.location.hostname}\nServer: ${lastConnectOptions.value?.server ?? '<not a server>'}\nPlatform: ${platform}\nWebsite: ${window.location.href}`
+                const currentHost = window.location.hostname
+                const options = [
+                  'GitHub (please use it if you can)',
+                  'Email',
+                  ...((currentHost === 'mcraft.fun' || currentHost === 'ru.mcraft.fun') ? ['Try Beta Version'] : []),
+                  // 'Use previous versions of client'
+                ]
+                const action = await showOptionsModal('Report client issue', options)
+                if (!action) return
+
+                switch (action) {
+                  case 'GitHub (please use it if you can)':
+                    openGithub(`/issues/new?body=${encodeURIComponent(body)}&title=${encodeURIComponent('[Bug Report] <describe your issue here>')}&labels=bug`)
+                    break
+                  case 'Email': {
+                    window.location.href = `mailto:support@mcraft.fun?body=${encodeURIComponent(body)}`
+                    break
+                  }
+                  case 'Try Beta Version': {
+                    if (currentHost === 'mcraft.fun') {
+                      window.location.href = 'https://s.mcraft.fun'
+                    } else if (currentHost === 'ru.mcraft.fun') {
+                      window.location.href = 'https://s.pcm.gg'
+                    }
+                    break
+                  }
+                  case 'Use previous versions of client':
+                    // TODO: Implement versions screen
+                    void showOptionsModal('Previous versions', [])
+                    break
+                }
+              }}
+            />
+          )}
+        </div>
       )}
     </div>
     <LoadingTimer />
diff --git a/src/utils.ts b/src/utils.ts
index d48fbbc3..3ccc7fc4 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -163,7 +163,7 @@ export const reloadChunks = async () => {
 }
 
 export const openGithub = (addUrl = '') => {
-  window.open(`${process.env.GITHUB_URL}${addUrl}`, '_blank')
+  window.open(`${process.env.GITHUB_URL?.replace(/\/$/, '')}${addUrl}`, '_blank')
 }
 
 export const resolveTimeout = async (promise, timeout = 10_000) => {