diff --git a/src/sbbs3/getkey.cpp b/src/sbbs3/getkey.cpp
index 5f7bb3addb6e8d0ed827b35ad39ff991699dc747..43e0c52ab0b317af24ebf520b0d252c4291066ac 100644
--- a/src/sbbs3/getkey.cpp
+++ b/src/sbbs3/getkey.cpp
@@ -517,7 +517,7 @@ void sbbs_t::pause()
 		rioctl(IOFI);
 	bputs(text[Pause]);
 	j=bstrlen(text[Pause]);
-	if(sys_status&SS_USERON && !(useron.misc&WIP)
+	if(sys_status&SS_USERON && !(useron.misc&(WIP|NOPAUSESPIN))
 		&& !(cfg.node_misc&NM_NOPAUSESPIN))
 		l|=K_SPIN;
 	ch=getkey(l);
diff --git a/src/sbbs3/sbbsdefs.h b/src/sbbs3/sbbsdefs.h
index 4cdf43f93d78beaa4f4273b3137470bb15336e54..fe407bcdb1c8721db4434efd65eda6336a4f7ca7 100644
--- a/src/sbbs3/sbbsdefs.h
+++ b/src/sbbs3/sbbsdefs.h
@@ -173,24 +173,11 @@ typedef struct {
 #define SM_SYSVDELM		(1L<<31)	/* Sysops can see deleted msgs				*/
 						
 									/* Different bits in node_misc				*/
-#define NM_ANSALARM		(1<<0)		/* Alarm locally on answer					*/
-#define NM_WFCSCRN		(1<<1)		/* Wait for call screen                     */
-#define NM_WFCMSGS		(1<<2)		/* Include total messages/files on WFC		*/
-#define NM_LCL_EDIT		(1<<3)		/* Use local editor to create messages		*/
-#define NM_EMSOVL		(1<<4)		/* Use expanded memory of overlays			*/
-#define NM_WINOS2		(1<<5)		/* Use Windows/OS2 time slice API call		*/
-#define NM_INT28		(1<<6)		/* Make int 28 DOS idle calls				*/
-#define NM_NODV 		(1<<7)		/* Don't detect and use DESQview API        */
 #define NM_NO_NUM		(1<<8)		/* Don't allow logons by user number        */
 #define NM_LOGON_R		(1<<9)		/* Allow logons by user real name			*/
 #define NM_LOGON_P		(1<<10)		/* Secure logons (always ask for password)	*/
-#define NM_NO_LKBRD		(1<<11)		/* No local keyboard (at all)				*/
-#define NM_SYSPW		(1<<12)		/* Protect WFC keys and Alt keys with SY:	*/
-#define NM_NO_INACT		(1<<13)		/* No local inactivity alert/logoff 		*/
-#define NM_NOBEEP		(1<<14)		/* Don't beep locally                       */
 #define NM_LOWPRIO		(1<<15)		/* Always use low priority input			*/
 #define NM_7BITONLY		(1L<<16)	/* Except 7-bit input only (E71 terminals)	*/
-#define NM_RESETVID		(1L<<17)	/* Reset video mode between callers?		*/
 #define NM_NOPAUSESPIN	(1L<<18)	/* No spinning cursor at pause prompt		*/
 #define NM_CLOSENODEDAB	(1L<<19)	/* Keep node.dab file closed (for Samba)	*/
 
@@ -464,9 +451,6 @@ typedef enum {						/* Values for xtrn_t.event				*/
 #define CON_DELETELINE	(1<<17)	/* Deleted line, exiting from getstr()		*/
 																			
 							/* Number of milliseconds						*/
-#define DELAY_HANGUP 250    /* Delay before modem drops carrier				*/
-#define DELAY_MDMTLD 500    /* Delay to give each ~ in modem strings		*/
-#define DELAY_SPIN   10     /* Delay for the spinning cursor				*/
 #define DELAY_AUTOHG 1500	/* Delay for auto-hangup (xfer) 				*/
 																			
 #define SEC_LOGON	1800	/* 30 minutes allowed to logon					*/
@@ -629,6 +613,7 @@ typedef enum {						/* Values for xtrn_t.event				*/
 #define WIP 		(1L<<21)		/* Supports WIP terminal emulation		*/
 #define AUTOLOGON	(1L<<22)		/* AutoLogon via IP						*/
 #define HTML		(1L<<23)		/* Using Deuce's HTML terminal			*/
+#define NOPAUSESPIN	(1L<<24)		/* No spinning cursor at pause prompt	*/
 																			
 #define CLREOL      256     /* Character to erase to end of line 			*/
 																			
diff --git a/src/sbbs3/useredit.cpp b/src/sbbs3/useredit.cpp
index de395ec5a7f6ce668f4697df8baabaa776eb75c8..8f84a52dc847e368243e1300783a92c2242c5210 100644
--- a/src/sbbs3/useredit.cpp
+++ b/src/sbbs3/useredit.cpp
@@ -781,7 +781,7 @@ void sbbs_t::maindflts(user_t* user)
 		bprintf(text[UserDefaultsHotKey]
 			,user->misc&COLDKEYS ? text[Off] : text[On]);
 		bprintf(text[UserDefaultsCursor]
-			,user->misc&SPIN ? text[On] : text[Off]);
+			,user->misc&SPIN ? text[On] : user->misc&NOPAUSESPIN ? text[Off] : "Pause Prompt Only");
 		bprintf(text[UserDefaultsCLS]
 			,user->misc&CLRSCRN ? text[On] : text[Off]);
 		bprintf(text[UserDefaultsAskNScan]
@@ -905,6 +905,9 @@ void sbbs_t::maindflts(user_t* user)
 				break;
 			case 'S':
 				user->misc^=SPIN;
+				if(!(user->misc&SPIN))
+					if(!yesno("Spinning cursor on pause prompts"))
+						user->misc|=NOPAUSESPIN;
 				putuserrec(&cfg,user->number,U_MISC,8,ultoa(user->misc,str,16));
 				break;
 			case 'F':