diff --git a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash
index 9bc0c02495..a030722f69 100644
--- a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash
+++ b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.hash
@@ -1 +1 @@
-B840A83E8560C8EB17205E2B98F1D9CD25FBC390562E8A5A437B692EEA6D8F15
\ No newline at end of file
+7AA081A68C6157F9B74DDB6B04F00B1691113941EED8996A4DEABF643F45EA25
\ No newline at end of file
diff --git a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm
index e1ab66d206..c523d51759 100644
--- a/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm
+++ b/runelite-client/src/main/scripts/ChatboxInputWidgetBuilder.rs2asm
@@ -47,8 +47,19 @@ LABEL23:
get_varbit 8119
iconst 1
if_icmpeq LABEL42
- jump LABEL146
+ jump LABEL155
LABEL42:
+ invoke 3160
+ iconst 1
+ if_icmpeq LABEL46
+ jump LABEL51
+LABEL46:
+ sconst "
"
+ chat_playername
+ join_string 2
+ sstore 2
+ jump LABEL59
+LABEL51:
iconst 105
iconst 115
iconst 1894
@@ -57,16 +68,17 @@ LABEL42:
chat_playername
join_string 2
sstore 2
+LABEL59:
iload 4
iconst 1
- if_icmpeq LABEL54
- jump LABEL58
-LABEL54:
+ if_icmpeq LABEL63
+ jump LABEL67
+LABEL63:
sload 2
sconst "
"
append
sstore 2
-LABEL58:
+LABEL67:
sload 2
sconst ": "
sload 0
@@ -77,9 +89,9 @@ LABEL58:
sstore 2
iload 2
iconst 80
- if_icmplt LABEL70
- jump LABEL77
-LABEL70:
+ if_icmplt LABEL79
+ jump LABEL86
+LABEL79:
sload 2
sload 0
sconst "*"
@@ -87,7 +99,7 @@ LABEL70:
join_string 3
append
sstore 2
-LABEL77:
+LABEL86:
sload 2
iconst 2147483647
iconst 495
@@ -95,9 +107,9 @@ LABEL77:
istore 3
iload 4
iconst 1
- if_icmpeq LABEL86
- jump LABEL103
-LABEL86:
+ if_icmpeq LABEL95
+ jump LABEL112
+LABEL95:
iconst 60
iconst 5
iload 3
@@ -114,8 +126,8 @@ LABEL86:
iconst 2
iconst 10616871
if_setposition
- jump LABEL115
-LABEL103:
+ jump LABEL124
+LABEL112:
iconst 0
iconst 30
iconst 0
@@ -128,26 +140,26 @@ LABEL103:
iconst 2
iconst 10616871
if_setposition
-LABEL115:
+LABEL124:
iload 3
iconst 10616890
if_getwidth
- if_icmpgt LABEL120
- jump LABEL126
-LABEL120:
+ if_icmpgt LABEL129
+ jump LABEL135
+LABEL129:
iconst 2
iconst 2
iconst 0
iconst 10616890
if_settextalign
- jump LABEL131
-LABEL126:
+ jump LABEL140
+LABEL135:
iconst 0
iconst 2
iconst 0
iconst 10616890
if_settextalign
-LABEL131:
+LABEL140:
iconst 10616890
if_clearops
iconst -1
@@ -162,8 +174,19 @@ LABEL131:
sconst ""
iconst 10616890
if_setonop
- jump LABEL187
-LABEL146:
+ jump LABEL205
+LABEL155:
+ invoke 3160
+ iconst 1
+ if_icmpeq LABEL159
+ jump LABEL164
+LABEL159:
+ sconst "
"
+ sconst " You must set a name before you can chat."
+ join_string 2
+ sstore 2
+ jump LABEL172
+LABEL164:
iconst 105
iconst 115
iconst 1894
@@ -172,6 +195,7 @@ LABEL146:
sconst " You must set a name before you can chat."
join_string 2
sstore 2
+LABEL172:
iconst 1
iconst 2
iconst 0
@@ -205,7 +229,7 @@ LABEL146:
sconst "ii"
iconst 10616890
if_setonop
-LABEL187:
+LABEL205:
sload 2
iconst 10616890
if_settext
diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash b/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash
index 325891a913..381dd10c4f 100644
--- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash
+++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash
@@ -1 +1 @@
-70481539CCDB751DD4627EE8F4765D6D5BFD331E32E51B73946913C3CE17D942
\ No newline at end of file
+1CCC672616971AEB7A1E4C00885367CEFC75A873DD22A37BE99652F2DA107653
\ No newline at end of file
diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm
index 70847540be..c713cbc000 100644
--- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm
+++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm
@@ -487,7 +487,7 @@ LABEL437:
iconst 73
iconst 73
iload 1
- iconst 10551305
+ iconst 10551304
enum
if_hassub
iconst 1
@@ -542,7 +542,7 @@ LABEL481:
iconst 73
iconst 73
iload 1
- iconst 10551305
+ iconst 10551304
enum
istore 18
iconst 0