diff --git a/frontend/src/sections/devices/cwmp/devices-wifi.js b/frontend/src/sections/devices/cwmp/devices-wifi.js
index e9047f2..f0ed7e5 100644
--- a/frontend/src/sections/devices/cwmp/devices-wifi.js
+++ b/frontend/src/sections/devices/cwmp/devices-wifi.js
@@ -1,31 +1,31 @@
 import { useCallback, useEffect, useState } from 'react';
 import {
-  Button,
-  Card,
-  CardActions,
-  CardContent,
-  CardHeader,
-  Divider,
-  Stack,
-  TextField,
-  InputLabel,
-  MenuItem, 
-  Select,
-  FormControl,
-  SvgIcon,
-  Dialog,
-  DialogTitle,
-  DialogContent,
-  DialogContentText,
-  DialogActions, 
-  Box,
-  IconButton,
-  Icon,
-  SnackbarContent,
-  Snackbar,
-  Checkbox,
-  FormControlLabel,
-  useTheme,
+    Button,
+    Card,
+    CardActions,
+    CardContent,
+    CardHeader,
+    Divider,
+    Stack,
+    TextField,
+    InputLabel,
+    MenuItem,
+    Select,
+    FormControl,
+    SvgIcon,
+    Dialog,
+    DialogTitle,
+    DialogContent,
+    DialogContentText,
+    DialogActions,
+    Box,
+    IconButton,
+    Icon,
+    SnackbarContent,
+    Snackbar,
+    Checkbox,
+    FormControlLabel,
+    useTheme,
 } from '@mui/material';
 import XMarkIcon from '@heroicons/react/24/outline/XMarkIcon';
 import Check from '@heroicons/react/24/outline/CheckIcon';
@@ -52,44 +52,44 @@ export const DevicesWiFi = () => {
         var myHeaders = new Headers();
         myHeaders.append("Content-Type", "application/json");
         myHeaders.append("Authorization", localStorage.getItem("token"));
-      
+
         var requestOptions = {
-          method: 'GET',
-          headers: myHeaders,
-          redirect: 'follow'
+            method: 'GET',
+            headers: myHeaders,
+            redirect: 'follow'
         };
 
         fetch(`${process.env.NEXT_PUBLIC_REST_ENDPOINT || ""}/api/device/${router.query.id[0]}/wifi`, requestOptions)
-        .then(response => {
-            if (response.status === 401) {
-                router.push("/auth/login")
-            }
-            return response.json()
-        })
-        .then(result => {
-            console.log("wifi content", result)
-            result.map((item) => {
-                let contentToApply = {
-                    hasChanges: false,
-                    path: item.path,
+            .then(response => {
+                if (response.status === 401) {
+                    router.push("/auth/login")
                 }
-                setApplyContent(oldValue => [...oldValue, contentToApply])
+                return response.json()
             })
-            setContent(result)
-        })
-        .catch(error => console.log('error', error));
+            .then(result => {
+                console.log("wifi content", result)
+                result.map((item) => {
+                    let contentToApply = {
+                        hasChanges: false,
+                        path: item.path,
+                    }
+                    setApplyContent(oldValue => [...oldValue, contentToApply])
+                })
+                setContent(result)
+            })
+            .catch(error => console.log('error', error));
     };
 
-    useEffect(()=>{
+    useEffect(() => {
         fetchWifiData()
-    },[])
+    }, [])
 
     return (<div>
-        <Stack 
-        direction="row" 
-        spacing={2}   
-        justifyContent="center" 
-        alignItems="center"
+        <Stack
+            direction="row"
+            spacing={2}
+            justifyContent="center"
+            alignItems="center"
         >
             {content.length > 1 ?
                 (content.map((item, index) => {
@@ -99,25 +99,25 @@ export const DevicesWiFi = () => {
                                 title={item.name.value}
                                 avatar={
                                     <SvgIcon>
-                                            <GlobeAltIcon/>
+                                        <GlobeAltIcon />
                                     </SvgIcon>
                                 }
                             />
                             <CardContent>
                                 <Stack spacing={3}>
-                                    { item.enable.value != null &&
-                                    <FormControlLabel control={<Checkbox defaultChecked={item.enable.value == 1 ? true : false} 
-                                    onChange={(e) => {
-                                        let enable = item.enable.value == 1 ? "0" : "1"
-                                        console.log(enable)
-                                        applyContent[index].hasChanges = true
-                                        applyContent[index].enable = {
-                                            value : enable
-                                        }
-                                        setApplyContent([...applyContent])
-                                        item.enable.value = enable
-                                    }}/>}
-                                    label="Enabled" />}
+                                    {item.enable.value != null &&
+                                        <FormControlLabel control={<Checkbox defaultChecked={item.enable.value == 1 ? true : false}
+                                            onChange={(e) => {
+                                                let enable = item.enable.value == 1 ? "0" : "1"
+                                                console.log(enable)
+                                                applyContent[index].hasChanges = true
+                                                applyContent[index].enable = {
+                                                    value: enable
+                                                }
+                                                setApplyContent([...applyContent])
+                                                item.enable.value = enable
+                                            }} />}
+                                            label="Enabled" />}
                                     {item.ssid.value != null && <TextField
                                         fullWidth
                                         label="SSID"
@@ -126,67 +126,91 @@ export const DevicesWiFi = () => {
                                         onChange={(e) => {
                                             applyContent[index].hasChanges = true
                                             applyContent[index].ssid = {
-                                                value : e.target.value
+                                                value: e.target.value
                                             }
                                             setApplyContent([...applyContent])
                                             item.ssid.value = e.target.value
                                         }}
                                     />}
                                     {item.securityCapabilities &&
-                                    <TextField
-                                        fullWidth
-                                        label="Encryption"
-                                        value={""}
-                                    />}
+                                        <TextField
+                                            fullWidth
+                                            label="Encryption"
+                                            value={""}
+                                        />}
                                     {item.password.value != null &&
-                                    <TextField
-                                        fullWidth
-                                        type="password"
-                                        label="Password"
-                                        disabled={!item.password.writable}
-                                        value={item.password.value}
-                                        onChange={(e) => {
-                                            if (e.target.value.length >= 8) {
-                                                applyContent[index].hasChanges = true
-                                            }else{
-                                                applyContent[index].hasChanges = false
-                                            }
-                                            applyContent[index].password = {
-                                                value : e.target.value
-                                            }
-                                            setApplyContent([...applyContent])
-                                            item.password.value = e.target.value
-                                            console.log("applyContent: ", applyContent)
-                                        }}
-                                    />}
+                                        <TextField
+                                            fullWidth
+                                            type="password"
+                                            label="Password"
+                                            disabled={!item.password.writable}
+                                            value={item.password.value}
+                                            onChange={(e) => {
+                                                if (e.target.value.length >= 8) {
+                                                    applyContent[index].hasChanges = true
+                                                } else {
+                                                    applyContent[index].hasChanges = false
+                                                }
+                                                applyContent[index].password = {
+                                                    value: e.target.value
+                                                }
+                                                setApplyContent([...applyContent])
+                                                item.password.value = e.target.value
+                                                console.log("applyContent: ", applyContent)
+                                            }}
+                                        />}
+                                    {item.channel?.value != null && item.possibleChannels?.value != null &&
+                                        <FormControl variant='filled'>
+                                            <InputLabel id="channel">Channel</InputLabel>
+                                            <Select
+                                                fullWidth
+                                                defaultValue={item.channel.value}
+                                                value={item.channel.value}
+                                                onChange={(e) => {
+                                                    applyContent[index].hasChanges = true
+                                                    applyContent[index].channel = {
+                                                        value: e.target.value
+                                                    }
+                                                    setApplyContent([...applyContent])
+                                                    item.channel.value = e.target.value
+                                                }}
+                                                label="Channel"
+                                            >
+                                                {item.possibleChannels.value.map((channel, index) => {
+                                                    return (
+                                                        <MenuItem key={index} value={channel}>{channel}</MenuItem>)
+                                                })}
+                                            </Select>
+                                        </FormControl>
+                                    }
                                     {item.standard.value != null &&
-                                    <TextField
-                                        fullWidth
-                                        label="Standard"
-                                        disabled={!item.standard.writable}
-                                        value={item.standard.value}
-                                        onChange={(e) => {
-                                            applyContent[index].hasChanges = true
-                                            applyContent[index].standard = {
-                                                value : e.target.value
-                                            }
-                                            setApplyContent([...applyContent])
-                                            item.standard.value = e.target.value
-                                        }}
-                                    />}
+                                        <TextField
+                                            fullWidth
+                                            label="Standard"
+                                            disabled={!item.standard.writable}
+                                            value={item.standard.value}
+                                            onChange={(e) => {
+                                                applyContent[index].hasChanges = true
+                                                applyContent[index].standard = {
+                                                    value: e.target.value
+                                                }
+                                                setApplyContent([...applyContent])
+                                                item.standard.value = e.target.value
+                                            }}
+                                        />}
                                 </Stack>
-                                <CardActions sx={{display:"flex", justifyContent:"flex-end"}}>
-                                    <Button 
-                                        variant="contained" 
+                                <CardActions sx={{ display: "flex", justifyContent: "flex-end" }}>
+                                    <Button
+                                        variant="contained"
                                         disabled={!applyContent[index].hasChanges}
-                                        endIcon={<SvgIcon><Check /></SvgIcon>} 
+                                        endIcon={<SvgIcon><Check /></SvgIcon>}
                                         onClick={
-                                            ()=>{
+                                            () => {
                                                 setApply(true)
                                                 var myHeaders = new Headers();
                                                 myHeaders.append("Content-Type", "application/json");
                                                 myHeaders.append("Authorization", localStorage.getItem("token"));
-                                                
+
                                                 delete applyContent[index].hasChanges
                                                 let contentToApply = [applyContent[index]]
                                                 console.log("contentToApply: ", contentToApply)
@@ -198,38 +222,38 @@ export const DevicesWiFi = () => {
                                                     redirect: 'follow'
                                                 };
                                                 fetch(`${process.env.NEXT_PUBLIC_REST_ENDPOINT || ""}/api/device/${router.query.id[0]}/wifi`, requestOptions)
-                                                .then(response => {
-                                                    if (response.status === 401) {
-                                                        router.push("/auth/login")
-                                                    }
-                                                    if (response.status == 500) {
-                                                        setErrorModal(true)
-                                                    }
-                                                    return response.json()
-                                                })
-                                                .then(result => {
-                                                    if (errorModal) {
-                                                        setErrorModalText(result)
-                                                    }
-                                                    setApply(false)
-                                                    if (result == 1) {
-                                                        setErrorModalText("This change could not be applied, or It's gonna be applied later on")
-                                                        setErrorModal(true)
-                                                        //TODO: fetch wifi data again
-                                                    }
-                                                })
-                                                .catch(error => console.log('error', error));
+                                                    .then(response => {
+                                                        if (response.status === 401) {
+                                                            router.push("/auth/login")
+                                                        }
+                                                        if (response.status == 500) {
+                                                            setErrorModal(true)
+                                                        }
+                                                        return response.json()
+                                                    })
+                                                    .then(result => {
+                                                        if (errorModal) {
+                                                            setErrorModalText(result)
+                                                        }
+                                                        setApply(false)
+                                                        if (result == 1) {
+                                                            setErrorModalText("This change could not be applied, or It's gonna be applied later on")
+                                                            setErrorModal(true)
+                                                            //TODO: fetch wifi data again
+                                                        }
+                                                    })
+                                                    .catch(error => console.log('error', error));
                                             }
                                         }
-                                        sx={{mt:'25px', mb:'-15px'}}
-                                        >
+                                        sx={{ mt: '25px', mb: '-15px' }}
+                                    >
                                         Apply
                                     </Button>
                                 </CardActions>
                             </CardContent>
                         </Card>
                     )
-                })):
+                })) :
                 <CircularProgress />
             }
         </Stack>
@@ -239,44 +263,44 @@ export const DevicesWiFi = () => {
         >
             <CircularProgress color="inherit" />
         </Backdrop>
-        <Dialog open={errorModal && errorModalText != ""} 
-                    slotProps={{ backdrop: { style: { backgroundColor: 'rgba(255,255,255,0.5)' } } }}
-                    fullWidth={ true } 
-                    maxWidth={"md"}   
-                    scroll={"paper"}
-                    aria-labelledby="scroll-dialog-title"
-                    aria-describedby="scroll-dialog-description" 
-                >
-                <DialogTitle id="scroll-dialog-title">
+        <Dialog open={errorModal && errorModalText != ""}
+            slotProps={{ backdrop: { style: { backgroundColor: 'rgba(255,255,255,0.5)' } } }}
+            fullWidth={true}
+            maxWidth={"md"}
+            scroll={"paper"}
+            aria-labelledby="scroll-dialog-title"
+            aria-describedby="scroll-dialog-description"
+        >
+            <DialogTitle id="scroll-dialog-title">
                 <Box display="flex" alignItems="center">
                     <Box flexGrow={1} >Response</Box>
                     <Box>
-                        <IconButton onClick={()=>{
-                                    setErrorModalText("")
-                                    setErrorModal(false)
-                                }}>
-                                <SvgIcon 
-                                >
-                                < XMarkIcon/>
+                        <IconButton onClick={() => {
+                            setErrorModalText("")
+                            setErrorModal(false)
+                        }}>
+                            <SvgIcon
+                            >
+                                < XMarkIcon />
                             </SvgIcon>
                         </IconButton>
                     </Box>
                 </Box>
-                </DialogTitle>    
-                    <DialogContent dividers={scroll === 'paper'}>
-                    <DialogContentText id="scroll-dialog-description"tabIndex={-1}>
-                    <pre style={{color: 'black'}}>
+            </DialogTitle>
+            <DialogContent dividers={scroll === 'paper'}>
+                <DialogContentText id="scroll-dialog-description" tabIndex={-1}>
+                    <pre style={{ color: 'black' }}>
                         {errorModalText}
                     </pre>
-                    </DialogContentText>
-                    </DialogContent>
-                    <DialogActions>
-                    <Button onClick={()=>{
-                        setErrorModalText("")
-                        setErrorModal(false)
-                    }}>OK</Button>
-                    </DialogActions>
-                </Dialog>
-        </div>
-  );
+                </DialogContentText>
+            </DialogContent>
+            <DialogActions>
+                <Button onClick={() => {
+                    setErrorModalText("")
+                    setErrorModal(false)
+                }}>OK</Button>
+            </DialogActions>
+        </Dialog>
+    </div>
+    );
 };