diff --git a/Ombi.Api/TheMovieDbApi.cs b/Ombi.Api/TheMovieDbApi.cs
index 1dee00d62..25ddc0a69 100644
--- a/Ombi.Api/TheMovieDbApi.cs
+++ b/Ombi.Api/TheMovieDbApi.cs
@@ -37,6 +37,8 @@ using TMDbLib.Objects.General;
 using TMDbLib.Objects.Movies;
 using TMDbLib.Objects.Search;
 using Movie = TMDbLib.Objects.Movies.Movie;
+using TMDbLib.Objects.People;
+using System.Linq;
 
 namespace Ombi.Api
 {
@@ -106,15 +108,15 @@ namespace Ombi.Api
             return movies ?? new Movie();
         }
 
-        public async Task<List<Movie>> SearchActor(string searchTerm)
+        public async Task<List<Movie>> SearchPerson(string searchTerm)
         {
-            return await SearchActor(searchTerm, null);
+            return await SearchPerson(searchTerm, null);
         }
 
-        public async Task<List<Movie>> SearchActor(string searchTerm, Func<int, string, string, Task<bool>> alreadyAvailable)
+        public async Task<List<Movie>> SearchPerson(string searchTerm, Func<int, string, string, Task<bool>> alreadyAvailable)
         {
             SearchContainer<SearchPerson> result = await Client.SearchPerson(searchTerm);
-            
+
             var people = result?.Results ?? new List<SearchPerson>();
             var person = (people.Count != 0 ? people[0] : null);
             var movies = new List<Movie>();
@@ -124,13 +126,19 @@ namespace Ombi.Api
                 if (person != null)
                 {
                     var credits = await Client.GetPersonMovieCredits(person.Id);
+                    
+                    // grab results from both cast and crew, prefer items in cast.  we can handle directors like this.
+                    List<Movie> movieResults = (from MovieRole role in credits.Cast select new Movie() { Id = role.Id, Title = role.Title, ReleaseDate = role.ReleaseDate }).ToList();
+                    movieResults.AddRange((from MovieJob job in credits.Crew select new Movie() { Id = job.Id, Title = job.Title, ReleaseDate = job.ReleaseDate }).ToList());
+
                     //only get the first 10 movies and delay a bit between each request so we don't overload the API
-                    foreach (var credit in credits.Cast)
-                    {   if (counter == 10)
+                    foreach (var m in movieResults)
+                    {
+                        if (counter == 10)
                             break;
-                        if (alreadyAvailable == null || !(await alreadyAvailable(credit.Id, credit.Title, credit.ReleaseDate.Value.Year.ToString())))
+                        if (alreadyAvailable == null || !(await alreadyAvailable(m.Id, m.Title, m.ReleaseDate.Value.Year.ToString())))
                         {
-                            movies.Add(await GetMovie(credit.Id));
+                            movies.Add(await GetMovie(m.Id));
                             counter++;
                         }
                         else
@@ -142,7 +150,7 @@ namespace Ombi.Api
                     }
                 }
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 Log.Log(LogLevel.Error, e);
             }
diff --git a/Ombi.UI/Modules/SearchModule.cs b/Ombi.UI/Modules/SearchModule.cs
index 84c58eae1..4751c0d85 100644
--- a/Ombi.UI/Modules/SearchModule.cs
+++ b/Ombi.UI/Modules/SearchModule.cs
@@ -121,8 +121,8 @@ namespace Ombi.UI.Modules
 
             Get["SearchIndex", "/", true] = async (x, ct) => await RequestLoad();
 
-            Get["actor/{searchTerm}", true] = async (x, ct) => await SearchActor((string)x.searchTerm);
-            Get["actor/new/{searchTerm}", true] = async (x, ct) => await SearchActor((string)x.searchTerm, true);
+            Get["actor/{searchTerm}", true] = async (x, ct) => await SearchPerson((string)x.searchTerm);
+            Get["actor/new/{searchTerm}", true] = async (x, ct) => await SearchPerson((string)x.searchTerm, true);
             Get["movie/{searchTerm}", true] = async (x, ct) => await SearchMovie((string)x.searchTerm);
             Get["tv/{searchTerm}", true] = async (x, ct) => await SearchTvShow((string)x.searchTerm);
             Get["music/{searchTerm}", true] = async (x, ct) => await SearchAlbum((string)x.searchTerm);
@@ -229,15 +229,15 @@ namespace Ombi.UI.Modules
             return await ProcessMovies(MovieSearchType.Search, searchTerm);
         }
 
-        private async Task<Response> SearchActor(string searchTerm)
+        private async Task<Response> SearchPerson(string searchTerm)
         {
-            var movies = TransformMovieListToMovieResultList(await MovieApi.SearchActor(searchTerm).ConfigureAwait(false));
+            var movies = TransformMovieListToMovieResultList(await MovieApi.SearchPerson(searchTerm).ConfigureAwait(false));
             return await TransformMovieResultsToResponse(movies);
         }
 
-        private async Task<Response> SearchActor(string searchTerm, bool filterExisting)
+        private async Task<Response> SearchPerson(string searchTerm, bool filterExisting)
         {
-            var movies = TransformMovieListToMovieResultList(await MovieApi.SearchActor(searchTerm, AlreadyAvailable).ConfigureAwait(false));
+            var movies = TransformMovieListToMovieResultList(await MovieApi.SearchPerson(searchTerm, AlreadyAvailable).ConfigureAwait(false));
             return await TransformMovieResultsToResponse(movies);
         }