diff --git a/board/hammer/board.h b/board/hammer/board.h
index ac87d9b2a2..2ccb3aca23 100644
--- a/board/hammer/board.h
+++ b/board/hammer/board.h
@@ -177,15 +177,20 @@
 #define CONFIG_TOUCHPAD_I2C_PORT 0
 #define CONFIG_TOUCHPAD_I2C_ADDR (0x15 << 1)
 
+#define CONFIG_CURVE25519
+
+#define CONFIG_USB_PAIRING
+
 #else /* SECTION_IS_RO */
 /* Sign and switch to RW partition on boot. */
 #define CONFIG_RWSIG
 #define CONFIG_RSA
-#define CONFIG_SHA256
 #define CONFIG_RSA_KEY_SIZE 3072
 #define CONFIG_RSA_EXPONENT_3
 #endif
 
+#define CONFIG_SHA256
+
 #define CONFIG_RWSIG_TYPE_RWSIG
 
 /*
diff --git a/board/hammer/ec.tasklist b/board/hammer/ec.tasklist
index 81dcca2136..06ff3e0c1d 100644
--- a/board/hammer/ec.tasklist
+++ b/board/hammer/ec.tasklist
@@ -18,7 +18,7 @@
  */
 #define CONFIG_TASK_LIST \
 	TASK_ALWAYS_RO(RWSIG,    rwsig_task,   NULL, 1024) \
-	TASK_ALWAYS   (HOOKS,    hook_task,    NULL, 1280) \
+	TASK_ALWAYS   (HOOKS,    hook_task,    NULL, 2048) \
 	TASK_ALWAYS_RW(TOUCHPAD, elan_tp_task, NULL, TASK_STACK_SIZE) \
 	TASK_ALWAYS   (CONSOLE,  console_task, NULL, 1024) \
 	TASK_NOTEST_RW(KEYSCAN,  keyboard_scan_task, NULL, TASK_STACK_SIZE)