diff --git a/src/components/Form/DynamicForm.tsx b/src/components/Form/DynamicForm.tsx
index 470f36e7..61c4c0e7 100644
--- a/src/components/Form/DynamicForm.tsx
+++ b/src/components/Form/DynamicForm.tsx
@@ -40,7 +40,6 @@ export interface DynamicFormProps<T extends FieldValues> {
   onSubmit: SubmitHandler<T>;
   submitType?: "onChange" | "onSubmit";
   hasSubmitButton?: boolean;
-  // defaultValues?: DeepPartial<T>;
   defaultValues?: DefaultValues<T>;
   fieldGroups: {
     label: string;
diff --git a/src/components/PageComponents/Channel.tsx b/src/components/PageComponents/Channel.tsx
index fd425995..d90e950b 100644
--- a/src/components/PageComponents/Channel.tsx
+++ b/src/components/PageComponents/Channel.tsx
@@ -59,30 +59,14 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
   };
 
   const validatePass = (input: string, count: number) => {
-    if (count === 32) {
-      if (input.length !== 44) {
-        setValidationText("Please enter a valid 256 bit PSK.");
-      } else {
-        setValidationText(undefined);
-      }
-    } else if (count === 16) {
-      if (input.length !== 24) {
-        setValidationText("Please enter a valid 128 bit PSK.");
-      } else {
-        setValidationText(undefined);
-      }
-    } else if (count === 1) {
-      if (input.length !== 4) {
-        setValidationText("Please enter a valid 1 bit PSK");
-      } else {
-        setValidationText(undefined);
-      }
+    if (input.length % 4 !== 0 || toByteArray(input).length !== count) {
+      setValidationText(`Please enter a valid ${count * 8} bit PSK.`);
     } else {
-      setValidationText("Unkown PSK length.");
+      setValidationText(undefined);
     }
   };
 
-  const inputChangeEvent = (e) => {
+  const inputChangeEvent = (e: React.ChangeEvent<HTMLInputElement>) => {
     const psk = e.currentTarget?.value;
     setPass(psk);
     validatePass(psk, bitCount);