diff --git a/src/components/dashboard/users/InputElement.tsx b/src/components/dashboard/users/InputElement.tsx
index 5ece3ac0b4..ffcc434191 100644
--- a/src/components/dashboard/users/InputElement.tsx
+++ b/src/components/dashboard/users/InputElement.tsx
@@ -18,14 +18,14 @@ type IProps = {
     options?: string
 }
 
-const InputElement: FunctionComponent<IProps> = ({ type, id, label, ...rest }: IProps) => {
+const InputElement: FunctionComponent<IProps> = ({ type, id, label, options }: IProps) => {
     return (
         <div
             dangerouslySetInnerHTML={createInputElement({
                 type: type,
                 id: id,
                 label: globalize.translate(label),
-                options: rest.options ? rest.options : ''
+                options: options ? options : ''
             })}
         />
     );
diff --git a/src/components/pages/NewUserPage.tsx b/src/components/pages/NewUserPage.tsx
index 8e65d46fe2..604a600409 100644
--- a/src/components/pages/NewUserPage.tsx
+++ b/src/components/pages/NewUserPage.tsx
@@ -45,16 +45,13 @@ const NewUserPage: FunctionComponent = () => {
 
         loadUser();
 
-        const getItemsResult = items => {
-            const itemsArr: ItemsArr[] = [];
-
-            for (const item of items) {
-                itemsArr.push({
+        const getItemsResult = (items: ItemsArr[]) => {
+            return items.map(item =>
+                ({
                     Id: item.Id,
                     Name: item.Name
-                });
-            }
-            return itemsArr;
+                })
+            );
         };
 
         const loadMediaFolders = (result) => {